diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-25 02:49:43 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-25 02:56:25 +0200 |
| commit | df275f5b856501e980fe41d9de2d9a8558bdfce3 (patch) | |
| tree | 1d3303b36c569200dcfb85985256a38c8ec9556d /pkgs/os-specific/linux | |
| parent | 447207d21d63e285dccdb992751a5e72f339e3e0 (diff) | |
| download | nixpkgs-df275f5b856501e980fe41d9de2d9a8558bdfce3.tar nixpkgs-df275f5b856501e980fe41d9de2d9a8558bdfce3.tar.gz nixpkgs-df275f5b856501e980fe41d9de2d9a8558bdfce3.tar.bz2 nixpkgs-df275f5b856501e980fe41d9de2d9a8558bdfce3.tar.lz nixpkgs-df275f5b856501e980fe41d9de2d9a8558bdfce3.tar.xz nixpkgs-df275f5b856501e980fe41d9de2d9a8558bdfce3.tar.zst nixpkgs-df275f5b856501e980fe41d9de2d9a8558bdfce3.zip | |
treewide: fix darwin builds by referring to stdenv's libc
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/busybox/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/sinit/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index eaf45745f02..efb06ba845e 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") ''; - buildInputs = lib.optionals (enableStatic && !useMusl) [ glibc glibc.static ]; + buildInputs = lib.optionals (enableStatic && !useMusl) [ stdenv.cc.libc stdenv.cc.libc.static ]; crossAttrs = { extraCrossConfig = '' diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix index 0c56a21d6c1..69ffbd61760 100644 --- a/pkgs/os-specific/linux/sinit/default.nix +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -10,7 +10,7 @@ let rev = "refs/tags/v${version}"; }; buildInputs = [ - stdenv.glibc.static + stdenv.cc.libc.static ]; in stdenv.mkDerivation { |