diff options
| author | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2016-07-19 10:37:02 +0000 |
| commit | 203846b9de3bc67e77c93be9d111408286a17d5d (patch) | |
| tree | 3306a68a635fad0de834440c25f7e1b69b1e4b10 /pkgs/os-specific/linux/busybox | |
| parent | 6539901c7f5eeb18cf5e9a493c230a912ff27f82 (diff) | |
| parent | b54009fdfb7951bb5423c4fabcb28b70581b5ba8 (diff) | |
| download | nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.gz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.bz2 nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.lz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.xz nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.tar.zst nixpkgs-203846b9de3bc67e77c93be9d111408286a17d5d.zip | |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'pkgs/os-specific/linux/busybox')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index ec374d9b1d3..182b8c01c39 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, musl +{ stdenv, lib, fetchurl, glibc, musl , enableStatic ? false , enableMinimal ? false , useMusl ? false @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { CONFIG_LFS y - ${stdenv.lib.optionalString enableStatic '' + ${lib.optionalString enableStatic '' CONFIG_STATIC y ''} @@ -66,10 +66,12 @@ stdenv.mkDerivation rec { EOF make oldconfig - '' + stdenv.lib.optionalString useMusl '' + '' + lib.optionalString useMusl '' makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; + buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ]; + crossAttrs = { extraCrossConfig = '' CONFIG_CROSS_COMPILER_PREFIX "${stdenv.cross.config}-" |