diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index c6ba5fe2b93e6..9618fb6c31778 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -6,10 +6,10 @@ { lib , python3Packages , fetchFromGitHub -, pkgsStatic , stdenv , nixosTests , testers +, busybox-static , util-linux , gns3-server }: @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication { # GNS3 2.3.26 requires a static BusyBox for the Docker integration prePatch = '' - cp ${pkgsStatic.busybox}/bin/busybox gns3server/compute/docker/resources/bin/busybox + cp ${busybox-static}/bin/busybox gns3server/compute/docker/resources/bin/busybox ''; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85fb98cb0f447..208b1c4d8a998 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26041,12 +26041,8 @@ with pkgs; overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx else stdenv; }; - busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { - # musl roadmap has RISC-V support projected for 1.1.20 - busybox = if !stdenv.hostPlatform.isRiscV && !stdenv.hostPlatform.isLoongArch64 && stdenv.hostPlatform.libc != "bionic" - then pkgsStatic.busybox - else busybox; - }; + busybox-static = busybox.override { enableStatic = true; }; + busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { }; cachefilesd = callPackage ../os-specific/linux/cachefilesd { };