treewide: fix darwin builds by referring to stdenv's libc
This commit is contained in:
parent
447207d21d
commit
df275f5b85
|
@ -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
|
||||
'';
|
||||
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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 = ''
|
||||
|
|
|
@ -10,7 +10,7 @@ let
|
|||
rev = "refs/tags/v${version}";
|
||||
};
|
||||
buildInputs = [
|
||||
stdenv.glibc.static
|
||||
stdenv.cc.libc.static
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue