diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-18 16:56:39 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-18 16:56:39 -0500 |
| commit | bbfc9ce376d425db075a3a97c5b1363e2826acbe (patch) | |
| tree | 5a8864ff7dd8a988358bb7d9ff9e2df147956c00 /pkgs/os-specific | |
| parent | d8c2bac68c33788064bfb9be99c7337670f3f8a3 (diff) | |
| parent | a96886863a0616f528b4cfe17faf182cb29d3a03 (diff) | |
| download | nixpkgs-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar nixpkgs-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.gz nixpkgs-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.bz2 nixpkgs-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.lz nixpkgs-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.xz nixpkgs-bbfc9ce376d425db075a3a97c5b1363e2826acbe.tar.zst nixpkgs-bbfc9ce376d425db075a3a97c5b1363e2826acbe.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/sandbox-shell.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/busybox/sandbox-shell.nix b/pkgs/os-specific/linux/busybox/sandbox-shell.nix index 1755bd4f3f7..b94fae7f787 100644 --- a/pkgs/os-specific/linux/busybox/sandbox-shell.nix +++ b/pkgs/os-specific/linux/busybox/sandbox-shell.nix @@ -1,8 +1,9 @@ -{ busybox }: +{ busybox, hostPlatform }: # Minimal shell for use as basic /bin/sh in sandbox builds busybox.override { - useMusl = true; + # musl roadmap has RISC-V support projected for 1.1.20 + useMusl = !hostPlatform.isRiscV; enableStatic = true; enableMinimal = true; extraConfig = '' |