diff options
| author | Domen Kožar <domen@dev.si> | 2019-09-29 16:55:48 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2019-09-29 16:56:16 +0200 |
| commit | 39769df9dfa63263850e9c4f6f771873b89198b5 (patch) | |
| tree | 97de38a39ebc891b392fb74b02aa5e1a19fb070d | |
| parent | 406335aeb139ca5510c724c730e4f5ea83ad8cf3 (diff) | |
busybox: flip around logic how musl is determined
| -rw-r--r-- | pkgs/os-specific/linux/busybox/sandbox-shell.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix index c2d82ebc487a..036ea0a0f486 100644 --- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix +++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -2,8 +2,6 @@ # Minimal shell for use as basic /bin/sh in sandbox builds busybox.override { - # musl roadmap has RISC-V support projected for 1.1.20 - useMusl = !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic"; enableStatic = true; enableMinimal = true; extraConfig = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f992cc9919bf..076f8e3415ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15473,7 +15473,12 @@ in bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; busybox = callPackage ../os-specific/linux/busybox { }; - busybox-sandbox-shell = callPackage ../os-specific/linux/busybox/sandbox-shell.nix { }; + 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.libc != "bionic" + then pkgsStatic.busybox + else busybox; + }; cachefilesd = callPackage ../os-specific/linux/cachefilesd { }; |