public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

busybox: flip around logic how musl is determined

Browse Source
This commit is contained in:
Domen Kožar 2019-09-29 16:55:48 +02:00
parent 406335aeb1
commit 39769df9df
No known key found for this signature in database
GPG Key ID: C2FFBCAFD2C24246
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/os-specific/linux/busybox/sandbox-shell.nix
View File

@ -2,8 +2,6 @@
# Minimal shell for use as basic /bin/sh in sandbox builds # Minimal shell for use as basic /bin/sh in sandbox builds
busybox.override { busybox.override {
# musl roadmap has RISC-V support projected for 1.1.20
useMusl = !stdenv.hostPlatform.isRiscV && stdenv.hostPlatform.libc != "bionic";
enableStatic = true; enableStatic = true;
enableMinimal = true; enableMinimal = true;
extraConfig = '' extraConfig = ''

7
pkgs/top-level/all-packages.nix
View File

@ -15473,7 +15473,12 @@ in
bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; bridge-utils = callPackage ../os-specific/linux/bridge-utils { };
busybox = callPackage ../os-specific/linux/busybox { }; 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 { }; cachefilesd = callPackage ../os-specific/linux/cachefilesd { };