diff options
| author | Shea Levy <shea@shealevy.com> | 2018-02-18 16:16:48 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2018-02-18 16:16:48 -0500 |
| commit | a96886863a0616f528b4cfe17faf182cb29d3a03 (patch) | |
| tree | 1c74802a2e4f41f20d06344b17270479dc3924b6 /pkgs/os-specific | |
| parent | dc2b7b9e685815a8b689dc1131ec4078701ec7f9 (diff) | |
| parent | 0a0ecc4c2c0c6b55a250f7c31e06fb090e307259 (diff) | |
| download | nixpkgs-a96886863a0616f528b4cfe17faf182cb29d3a03.tar nixpkgs-a96886863a0616f528b4cfe17faf182cb29d3a03.tar.gz nixpkgs-a96886863a0616f528b4cfe17faf182cb29d3a03.tar.bz2 nixpkgs-a96886863a0616f528b4cfe17faf182cb29d3a03.tar.lz nixpkgs-a96886863a0616f528b4cfe17faf182cb29d3a03.tar.xz nixpkgs-a96886863a0616f528b4cfe17faf182cb29d3a03.tar.zst nixpkgs-a96886863a0616f528b4cfe17faf182cb29d3a03.zip | |
Merge branch 'riscv-initial-cross-support' of git://github.com/shlevy/nixpkgs
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 = '' |