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

treewide: Mass replace 'zlib}/lib' to refer the 'out' output

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-01-24 09:30:24 +02:00
parent 0f4244f51f
commit ed7dbb46a8
15 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/audio/milkytracker/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
preBuild=''
export CPATH=${zlib}/lib
export CPATH=${zlib.out}/lib
'';
buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ];

2
pkgs/applications/editors/texmacs/default.nix
View File

@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
postFixup = ''
bin="$out/libexec/TeXmacs/bin/texmacs.bin"
rpath=$(patchelf --print-rpath "$bin")
patchelf --set-rpath "$rpath:${zlib}/lib" "$bin"
patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin"
'';
meta = {

2
pkgs/development/compilers/gcc/4.3/default.nix
View File

@ -142,7 +142,7 @@ stdenv.mkDerivation ({
} // (if langJava then {
postConfigure = ''
make configure-gcc
sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib}/lib@'
sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib.out}/lib@'
sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc.out}/lib -lgc@'
'';
} else {})

2
pkgs/development/libraries/tokyo-cabinet/default.nix
View File

@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
postInstall =
'' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \
-e 's|-lz|-L${zlib}/lib -lz|g;
-e 's|-lz|-L${zlib.out}/lib -lz|g;
s|-lbz2|-L${bzip2.out}/lib -lbz2|g'
'';

2
pkgs/development/mobile/androidenv/androidndk_r8e.nix
View File

@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
\( -type f -a -name "*.so*" \) -o \
\( -type f -a -perm -0100 \) \
\) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
--set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \;
--set-rpath ${zlib.out}/lib:${ncurses.lib}/lib {} \;
# fix ineffective PROGDIR / MYNDKDIR determination
for i in ndk-build ndk-gdb ndk-gdb-py
do

2
pkgs/development/ocaml-modules/camlzip/default.nix
View File

@ -23,7 +23,7 @@ stdenv.mkDerivation {
postPatch = ''
substitute ${./META} META --subst-var-by VERSION "${version}"
substituteInPlace Makefile \
--subst-var-by ZLIB_LIBDIR "${zlib}/lib" \
--subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
--subst-var-by ZLIB_INCLUDE "${zlib}/include"
'';

2
pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
View File

@ -12,7 +12,7 @@ buildPerlPackage rec {
cat > config.in <<EOF
BUILD_ZLIB = False
INCLUDE = ${zlib}/include
LIB = ${zlib}/lib
LIB = ${zlib.out}/lib
OLD_ZLIB = False
GZIP_OS_CODE = AUTO_DETECT
EOF

2
pkgs/development/tools/build-managers/cargo/snapshot.nix
View File

@ -39,7 +39,7 @@ stdenv.mkDerivation {
./install.sh "--prefix=$out"
'' + (if stdenv.isLinux then ''
patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
--set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
--set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \
"$out/bin/cargo"
'' else "") + postInstall;
}

2
pkgs/games/openttd/default.nix
View File

@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
prefixKey = "--prefix-dir=";
configureFlags = [
"--with-zlib=${zlib}/lib/libz.a"
"--with-zlib=${zlib.out}/lib/libz.a"
"--without-liblzo2"
];

4
pkgs/servers/meteor/default.nix
View File

@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
popd
substituteInPlace $out/tools/cli/main.js \
--replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib}/lib" \
--replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib.out}/lib" \
--replace "@PATCHELF@" "${patchelf}/bin/patchelf"
# Patch node.
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
for p in $devBundle/mongodb/bin/mongo{,d}; do
patchelf \
--set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
--set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib}/lib" \
--set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib.out}/lib" \
$p
done

2
pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
View File

@ -201,7 +201,7 @@ rec {
cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
cp -d ${libmpc}/lib/libmpc*.so* $out/lib
cp -d ${zlib}/lib/libz.so* $out/lib
cp -d ${zlib.out}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib
# TBD: Why are these needed for cross but not native tools?

2
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -114,7 +114,7 @@ rec {
cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
cp -d ${libmpc}/lib/libmpc*.so* $out/lib
cp -d ${zlib}/lib/libz.so* $out/lib
cp -d ${zlib.out}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib
# Copy binutils.

2
pkgs/tools/filesystems/yandex-disk/default.nix
View File

@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
${patchelf}/bin/patchelf \
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "${zlib}/lib:${p.gcclib}" \
--set-rpath "${zlib.out}/lib:${p.gcclib}" \
$out/bin/yandex-disk
'';

2
pkgs/tools/graphics/pngcheck/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
# '';
makefile = "Makefile.unx";
makeFlags = "ZPATH=${zlib}/lib";
makeFlags = "ZPATH=${zlib.out}/lib";
buildInputs = [ zlib ];

2
pkgs/tools/networking/p2p/gtk-gnutella/default.nix
View File

@ -16,7 +16,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ bison pkgconfig ];
buildInputs = [ glib gtk libxml2 gettext zlib ];
NIX_LDFLAGS = "-rpath ${zlib}/lib";
NIX_LDFLAGS = "-rpath ${zlib.out}/lib";
configureScript = "./Configure";
dontAddPrefix = true;
configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true";