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

treewide: fix darwin builds by referring to stdenv's libc

Browse Source
This commit is contained in:
Franz Pletz 2016-08-25 02:49:43 +02:00
parent 447207d21d
commit df275f5b85
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/ike/default.nix
View File

@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
make install make install
for file in "$out"/bin/* "$out"/sbin/*; do 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 done
''; '';

2
pkgs/applications/science/logic/boolector/default.nix
View File

@ -23,7 +23,7 @@ let
license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3; license = with stdenv.lib.licenses; if useV16 then unfreeRedistributable else gpl3;
in in
stdenv.mkDerivation (boolectorPkg // { stdenv.mkDerivation (boolectorPkg // {
buildInputs = [ zlib stdenv.glibc.static zlib.static ]; buildInputs = [ zlib stdenv.cc.libc.static zlib.static ];
enableParallelBuilding = false; enableParallelBuilding = false;
installPhase = '' installPhase = ''

2
pkgs/development/tools/misc/prelink/default.nix
View File

@ -6,7 +6,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "prelink-${version}"; name = "prelink-${version}";
buildInputs = [ libelf stdenv.glibc stdenv.glibc.static ]; buildInputs = [ libelf stdenv.cc.libc stdenv.cc.libc.static ];
src = fetchurl { src = fetchurl {
url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2"; url = "http://people.redhat.com/jakub/prelink/prelink-${version}.tar.bz2";

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

@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
makeFlagsArray+=("CC=gcc -isystem ${musl}/include -B${musl}/lib -L${musl}/lib") 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 = { crossAttrs = {
extraCrossConfig = '' extraCrossConfig = ''

2
pkgs/os-specific/linux/sinit/default.nix
View File

@ -10,7 +10,7 @@ let
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
}; };
buildInputs = [ buildInputs = [
stdenv.glibc.static stdenv.cc.libc.static
]; ];
in in
stdenv.mkDerivation { stdenv.mkDerivation {

2
pkgs/tools/backup/partclone/default.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig ]; nativeBuildInputs = [ autoreconfHook pkgconfig ];
buildInputs = [ e2fsprogs libuuid stdenv.glibc stdenv.glibc.static ]; buildInputs = [ e2fsprogs libuuid stdenv.cc.libc stdenv.cc.libc.static ];
enableParallelBuilding = true; enableParallelBuilding = true;