From df275f5b856501e980fe41d9de2d9a8558bdfce3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 25 Aug 2016 02:49:43 +0200 Subject: [PATCH] treewide: fix darwin builds by referring to stdenv's libc --- pkgs/applications/networking/ike/default.nix | 2 +- pkgs/applications/science/logic/boolector/default.nix | 2 +- pkgs/development/tools/misc/prelink/default.nix | 2 +- pkgs/os-specific/linux/busybox/default.nix | 2 +- pkgs/os-specific/linux/sinit/default.nix | 2 +- pkgs/tools/backup/partclone/default.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index 0cd603996c13..a5c21e28c3d6 100644 --- a/pkgs/applications/networking/ike/default.nix +++ b/pkgs/applications/networking/ike/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { installPhase = '' make install for file in "$out"/bin/* "$out"/sbin/*; do - wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.glibc libedit qt4 ]}" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${stdenv.lib.makeLibraryPath [ openssl gcc.cc stdenv.cc.libc libedit qt4 ]}" done ''; diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 52c839130bb3..dec7989ae541 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -23,7 +23,7 @@ let license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3; in stdenv.mkDerivation (boolectorPkg // { - buildInputs = [ zlib stdenv.glibc.static zlib.static ]; + buildInputs = [ zlib stdenv.cc.libc.static zlib.static ]; enableParallelBuilding = false; installPhase = '' diff --git a/pkgs/development/tools/misc/prelink/default.nix b/pkgs/development/tools/misc/prelink/default.nix index b6645991c7b1..28b3aba8e5e4 100644 --- a/pkgs/development/tools/misc/prelink/default.nix +++ b/pkgs/development/tools/misc/prelink/default.nix @@ -6,7 +6,7 @@ in stdenv.mkDerivation rec { name = "prelink-${version}"; - buildInputs = [ libelf stdenv.glibc stdenv.glibc.static ]; + buildInputs = [ libelf stdenv.cc.libc stdenv.cc.libc.static ]; src = fetchurl { url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index eaf45745f024..efb06ba845e8 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 0c56a21d6c12..69ffbd61760f 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 { diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index 6bac8884ab43..87c7d61d8366 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ e2fsprogs libuuid stdenv.glibc stdenv.glibc.static ]; + buildInputs = [ e2fsprogs libuuid stdenv.cc.libc stdenv.cc.libc.static ]; enableParallelBuilding = true;