From e865a647f49c5fde4a2f64734b4891cf8fba291b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:56:58 +0200 Subject: brackets: Fix udev reference in multiple-outputs branch --- pkgs/applications/editors/brackets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 131675486bad..127ed981a6c8 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf -, cups, libgcrypt_1_5, makeWrapper, dbus, udev }: +, cups, libgcrypt_1_5, libudev, makeWrapper, dbus }: let bracketsEnv = buildEnv { name = "env-brackets"; paths = [ gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 - dbus udev + dbus libudev.out ]; }; in @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { rmdir $out/usr ln -sf $out/opt/brackets/brackets $out/bin/brackets - ln -s ${udev}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 + ln -s ${libudev.out}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \ -- cgit 1.4.1 From f412f5f3ee1ccfe909cb925fba92a4567f686869 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:28:56 +0200 Subject: treewide: Mass replace 'attr}/lib' to refer the 'out' output --- nixos/modules/security/apparmor-suid.nix | 2 +- pkgs/tools/filesystems/xtreemfs/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index 3da6a81158d0..c2dc84e6a75c 100644 --- a/nixos/modules/security/apparmor-suid.nix +++ b/nixos/modules/security/apparmor-suid.nix @@ -30,7 +30,7 @@ with lib; ${pkgs.glibc.out}/lib/*.so mr, ${pkgs.libcap}/lib/libcap.so* mr, - ${pkgs.attr}/lib/libattr.so* mr, + ${pkgs.attr.out}/lib/libattr.so* mr, ${pkgs.iputils}/bin/ping mixr, /var/setuid-wrappers/ping.real r, diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix index 8f090c297813..556cb674212d 100644 --- a/pkgs/tools/filesystems/xtreemfs/default.nix +++ b/pkgs/tools/filesystems/xtreemfs/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { --replace "/usr/local" "${valgrind}" substituteInPlace cpp/CMakeLists.txt \ - --replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"' + --replace '"/lib64" "/usr/lib64"' '"${attr.out}/lib" "${fuse}/lib"' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include" export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib" -- cgit 1.4.1 From c2ceed1ad143bf231402a8e010bcc5270a1930aa Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:28:57 +0200 Subject: treewide: Mass replace 'binutils}/lib' to refer the 'out' output --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index ed2154d00d2e..a56d744ab8d4 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -213,7 +213,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils}/bin/$i $out/bin done - cp -d ${binutils}/lib/lib*.so* $out/lib + cp -d ${binutils.out}/lib/lib*.so* $out/lib chmod -R u+w $out diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index b1a824983a3e..117346eb4edc 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -121,7 +121,7 @@ rec { for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils}/bin/$i $out/bin done - cp -d ${binutils}/lib/lib*.so* $out/lib + cp -d ${binutils.out}/lib/lib*.so* $out/lib chmod -R u+w $out diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5fa5974cbf3..48db91f15575 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15067,7 +15067,7 @@ in modules // { preConfigure = '' substituteInPlace setup.py \ --replace '"/usr/include"' '"${pkgs.gdb}/include"' \ - --replace '"/usr/lib"' '"${pkgs.binutils}/lib"' + --replace '"/usr/lib"' '"${pkgs.binutils.out}/lib"' ''; meta = { -- cgit 1.4.1 From 79738a639a5d93fc85ec73e382183af98499830a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:28:58 +0200 Subject: treewide: Mass replace 'binutils-raw}/lib' to refer the 'out' output --- pkgs/os-specific/darwin/binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index abe4aa67b143..d671c7c72303 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { # FIXME: this will give us incorrect man pages for bits of cctools ln -s ${binutils-raw}/share $out/share - ln -s ${binutils-raw}/lib $out/lib + ln -s ${binutils-raw.out}/lib $out/lib ln -s ${cctools}/libexec $out/libexec ''; -- cgit 1.4.1 From d0058081272f58025693581e751facc388b46c86 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:00 +0200 Subject: treewide: Mass replace 'boehmgc}/lib' to refer the 'out' output --- pkgs/development/compilers/gcc/4.3/default.nix | 2 +- pkgs/development/compilers/opendylan/bin.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 3db8ee5f3ea7..e97ae93cd531 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -143,7 +143,7 @@ stdenv.mkDerivation ({ 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${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc}/lib -lgc@' + sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc.out}/lib -lgc@' ''; } else {}) // (if langVhdl then rec { diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 4d18b8d328d6..492b1c4b3338 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation { interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" for a in "$out"/bin/*; do patchelf --set-interpreter "$interpreter" "$a" - patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done for a in "$out"/lib/*.so; do - patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" + patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a" done sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin -- cgit 1.4.1 From 51bf60b33e0c85e1d3beb5d7a12efe702efae864 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:00 +0200 Subject: treewide: Mass replace 'bzip2}/lib' to refer the 'out' output --- pkgs/applications/editors/sublime3/default.nix | 2 +- pkgs/development/libraries/tokyo-cabinet/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 49c30a1f6d60..c6cc813d6b11 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -57,7 +57,7 @@ in let --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 0b210a589d41..7512e085449c 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { postInstall = '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \ -e 's|-lz|-L${zlib}/lib -lz|g; - s|-lbz2|-L${bzip2}/lib -lbz2|g' + s|-lbz2|-L${bzip2.out}/lib -lbz2|g' ''; meta = { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de1fcc4e27ec..516b42a0274f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -1940,7 +1940,7 @@ let self = _self // overrides; _self = with self; { # Don't build a private copy of bzip2. BUILD_BZIP2 = false; - BZIP2_LIB = "${pkgs.bzip2}/lib"; + BZIP2_LIB = "${pkgs.bzip2.out}/lib"; BZIP2_INCLUDE = "${pkgs.bzip2}/include"; meta = { -- cgit 1.4.1 From 96372f2edb4b00a71a0aa9a97679853ffb95e3c6 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:01 +0200 Subject: treewide: Mass replace 'cairo}/lib' to refer the 'out' output --- nixos/modules/services/monitoring/graphite.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 976fd253a7cd..e59be1ea6c31 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -490,7 +490,7 @@ in { "${cfg.api.package}/lib/python2.7/site-packages:" + concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders; GRAPHITE_API_CONFIG = graphiteApiConfig; - LD_LIBRARY_PATH = "${pkgs.cairo}/lib"; + LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; }; serviceConfig = { ExecStart = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 48db91f15575..e0b4223f6f43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2565,7 +2565,7 @@ in modules // { patchPhase = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py + sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py ''; meta = { -- cgit 1.4.1 From dc8e939dbc9816a7b2c85bfd05a2f690f71fe2c8 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:02 +0200 Subject: treewide: Mass replace 'cups}/lib' to refer the 'out' output --- nixos/modules/services/printing/cupsd.nix | 8 ++++---- pkgs/applications/networking/browsers/opera/default.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 0fe25b66da08..ba288a5d0611 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -11,21 +11,21 @@ let additionalBackends = pkgs.runCommand "additional-cups-backends" { } '' mkdir -p $out - if [ ! -e ${cups}/lib/cups/backend/smb ]; then + if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then mkdir -p $out/lib/cups/backend ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb fi # Provide support for printing via HTTPS. - if [ ! -e ${cups}/lib/cups/backend/https ]; then + if [ ! -e ${cups.out}/lib/cups/backend/https ]; then mkdir -p $out/lib/cups/backend - ln -sv ${cups}/lib/cups/backend/ipp $out/lib/cups/backend/https + ln -sv ${cups.out}/lib/cups/backend/ipp $out/lib/cups/backend/https fi ''; # Here we can enable additional backends, filters, etc. that are not # part of CUPS itself, e.g. the SMB backend is part of Samba. Since - # we can't update ${cups}/lib/cups itself, we create a symlink tree + # we can't update ${cups.out}/lib/cups itself, we create a symlink tree # here and add the additional programs. The ServerBin directive in # cupsd.conf tells cupsd to use this tree. bindir = pkgs.buildEnv { diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index ab199ff97cdf..de7240d3a83b 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { postFixup = '' oldRPATH=`patchelf --print-rpath $out/lib/opera/opera` - patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera + patchelf --set-rpath $oldRPATH:${cups.out}/lib $out/lib/opera/opera # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command # It have no reasons to exist in a redistribuable package -- cgit 1.4.1 From f9bf203837469eb7184c24ce9934d6f3b997c785 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:09 +0200 Subject: treewide: Mass replace 'expat}/lib' to refer the 'out' output --- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 04fff8053819..263a3d965f84 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg}/lib" "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" + "--with-expatlibdir=${expat.out}/lib" ] ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 6eb8b5bceb2e..c8da74d02226 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg}/lib" "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" + "--with-expatlibdir=${expat.out}/lib" "--with-cgraph=no" "--with-sparse=no" ] -- cgit 1.4.1 From bb5660e873b8c888558abe37157ce9860c13a174 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:10 +0200 Subject: treewide: Mass replace 'fftw}/lib' to refer the 'out' output --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e0b4223f6f43..0ec3fd533604 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15427,11 +15427,11 @@ in modules // { doCheck = false; preConfigure = '' - export LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" + export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" ''; #+ optionalString isDarwin '' - # export DYLD_LIBRARY_PATH="${pkgs.fftw}/lib" + # export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib" #''; meta = { -- cgit 1.4.1 From fc6acf7a8791f88e11f3be37313828391dcd4a39 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:11 +0200 Subject: treewide: Mass replace 'fftwLongDouble}/lib' to refer the 'out' output --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0ec3fd533604..2834ef96b781 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15427,7 +15427,7 @@ in modules // { doCheck = false; preConfigure = '' - export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib" + export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble.out}/lib" export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" ''; #+ optionalString isDarwin '' -- cgit 1.4.1 From 7a7cc31076be891e800dbf5fe2bc30118c810d92 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:12 +0200 Subject: treewide: Mass replace 'fftwFloat}/lib' to refer the 'out' output --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2834ef96b781..12af1e32832e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15427,7 +15427,7 @@ in modules // { doCheck = false; preConfigure = '' - export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble.out}/lib" + export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib" export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include" ''; #+ optionalString isDarwin '' -- cgit 1.4.1 From b56b24f72909aaf156aae78390d8b4e5d21014ca Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:13 +0200 Subject: treewide: Mass replace 'freetype}/lib' to refer the 'out' output --- pkgs/games/warsow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index b525e3cb0f89..9f2dfbab2ecd 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { cp -rv basewsw libs $dest # Since 1.03 some modules are _always_ downloaded from server, thus makeWrapper $dest/warsow $out/bin/warsow \ - --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib" + --suffix-each LD_LIBRARY_PATH ':' "${freetype.out}/lib" makeWrapper $dest/wsw_server $out/bin/wsw_server makeWrapper $dest/wswtv_server $out/bin/wswtv_server ''; -- cgit 1.4.1 From a1909d73800a520b34640693343da7b68d5b7294 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:16 +0200 Subject: treewide: Mass replace 'glibc}/lib' to refer the 'out' output --- nixos/modules/system/boot/initrd-network.nix | 2 +- pkgs/applications/audio/baudline/default.nix | 2 +- pkgs/applications/editors/idea/common.nix | 2 +- pkgs/applications/misc/kiwix/default.nix | 2 +- pkgs/development/compilers/ponyc/default.nix | 2 +- pkgs/games/dwarf-fortress/default.nix | 2 +- pkgs/misc/cups/drivers/mfcj470dw/default.nix | 4 ++-- pkgs/os-specific/linux/fusionio/util.nix | 2 +- pkgs/servers/plex/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix index 6c6e2fafad43..d01222243f5d 100644 --- a/nixos/modules/system/boot/initrd-network.nix +++ b/nixos/modules/system/boot/initrd-network.nix @@ -102,7 +102,7 @@ in '' + optionalString cfg.ssh.enable '' copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear - cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib + cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib ''; boot.initrd.extraUtilsCommandsTest = optionalString cfg.ssh.enable '' diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix index 543329ef679b..2d6b0434d6a1 100644 --- a/pkgs/applications/audio/baudline/default.nix +++ b/pkgs/applications/audio/baudline/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { cp -r . "$out/libexec/baudline/" - interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)" + interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)" for prog in "$out"/libexec/baudline/baudline*; do patchelf --interpreter "$interpreter" "$prog" ln -sr "$prog" "$out/bin/" diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix index 96689fa75ad6..979a374701f8 100644 --- a/pkgs/applications/editors/idea/common.nix +++ b/pkgs/applications/editors/idea/common.nix @@ -37,7 +37,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { truncate --size=$size $fname } - interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2) + interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) if [ "${stdenv.system}" == "x86_64-linux" ]; then target_size=$(get_file_size bin/fsnotifier64) patchelf --set-interpreter "$interpreter" bin/fsnotifier64 diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index 30db6a45ea1b..d29e4fca3b29 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { make install cp -r src/dependencies/xulrunner $out/lib/kiwix - patchelf --set-interpreter ${glibc}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner + patchelf --set-interpreter ${glibc.out}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index c94ba203c0ff..f05555003f98 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { checkTarget = "test"; patchPhase = '' - sed 's|/usr/lib/x86_64-linux-gnu/|${glibc}/lib/|g' -i src/libponyc/codegen/genexe.c + sed 's|/usr/lib/x86_64-linux-gnu/|${glibc.out}/lib/|g' -i src/libponyc/codegen/genexe.c sed 's|/lib/x86_64-linux-gnu/|${stdenv.cc.cc}/lib/|g' -i src/libponyc/codegen/genexe.c ''; diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 317981cd8877..97c793b8a39f 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -194,7 +194,7 @@ stdenv.mkDerivation rec { # Fix rpath patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress - patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress + patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress # Store new hash patched_hash=$(md5sum $out/share/df_linux/libs/Dwarf_Fortress | awk '{ print $1 }') diff --git a/pkgs/misc/cups/drivers/mfcj470dw/default.nix b/pkgs/misc/cups/drivers/mfcj470dw/default.nix index d1a1b239371a..b61344d1280e 100644 --- a/pkgs/misc/cups/drivers/mfcj470dw/default.nix +++ b/pkgs/misc/cups/drivers/mfcj470dw/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter - patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1 + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1 mkdir -p $out/lib/cups/filter/ ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix index e2f8d423a61d..e77d596dc6f8 100644 --- a/pkgs/os-specific/linux/fusionio/util.nix +++ b/pkgs/os-specific/linux/fusionio/util.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out for BIN in $(find $out/bin -type f); do echo Patching $BIN - patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN + patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc.out}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN # Test our binary to see if it was correctly patched set +e diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix index 2aeb9379e10f..d88f7a89493d 100644 --- a/pkgs/servers/plex/default.nix +++ b/pkgs/servers/plex/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { # Now we need to patch up the executables and libraries to work on Nix. # Side note: PLEASE don't put spaces in your binary names. This is stupid. for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do - patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" + patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin" patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin" done find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \ - -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \; + -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \; # executables need libstdc++.so.6 ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 12af1e32832e..64afc8d0b945 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11339,7 +11339,7 @@ in modules // { patchPhase = optionalString stdenv.isLinux '' substituteInPlace monotonic.py --replace \ - "ctypes.util.find_library('c')" "'${stdenv.glibc}/lib/libc.so.6'" + "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; }; -- cgit 1.4.1 From df8495fb18305bfd926a4e7b4dbf5c27edb70400 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:17 +0200 Subject: treewide: Mass replace 'gmp}/lib' to refer the 'out' output --- pkgs/development/compilers/ghc/7.4.2-binary.nix | 6 +++--- pkgs/development/compilers/ghc/8.0.1.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index a57aff4d864f..70cd7d21c477 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ - -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \; + -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \; '' + stdenv.lib.optionalString stdenv.isDarwin '' find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { ln -sv "${ncurses.lib}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5" find . -type f -perm -0100 \ -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:${gmp}/lib" {} \; + --set-rpath "$out/lib:${gmp.out}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 for prog in ld ar gcc strip ranlib; do @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { configurePhase = '' ./configure --prefix=$out \ - --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \ + --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \ ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"} ''; diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index 7f337c019531..b262a448d4da 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" -- cgit 1.4.1 From 493349f82aac9aecebb9264ef2748fc32d8aa266 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:29 +0200 Subject: treewide: Mass replace 'libjpeg}/lib' to refer the 'out' output --- pkgs/applications/video/avxsynth/default.nix | 2 +- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix index d8ec715a38cb..06dcaf31b443 100644 --- a/pkgs/applications/video/avxsynth/default.nix +++ b/pkgs/applications/video/avxsynth/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "--enable-subtitle" "--enable-ffms2" (enableFeature avxeditSupport "avxedit") - "--with-jpeg=${libjpeg}/lib" + "--with-jpeg=${libjpeg.out}/lib" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 263a3d965f84..0e261837c8da 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng}/lib" "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" + "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat.out}/lib" ] diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index c8da74d02226..3642f83b7fb9 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng}/lib" "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" + "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" "--with-expatlibdir=${expat.out}/lib" "--with-cgraph=no" -- cgit 1.4.1 From 377e942f71753ba040f137c354a2bfd8c2a20a9f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:34 +0200 Subject: treewide: Mass replace 'libpng}/lib' to refer the 'out' output --- pkgs/tools/graphics/graphviz/2.0.nix | 2 +- pkgs/tools/graphics/graphviz/2.32.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 0e261837c8da..02b700111de3 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" + "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 3642f83b7fb9..8da3ea0a1749 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" + "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg}/include" "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat}/include" -- cgit 1.4.1 From 035fdf61c6e15d1df42fce4835b83e6828ad3821 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:36 +0200 Subject: treewide: Mass replace 'libpulseaudio}/lib' to refer the 'out' output --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64afc8d0b945..cc7232f235d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5576,7 +5576,7 @@ in modules // { propagatedBuildInputs = with self; [ keyring colour netifaces praw psutil basiciw pkgs.libpulseaudio ]; - ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio}/lib\""; + ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio.out}/lib\""; makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually postInstall = '' -- cgit 1.4.1 From 3e87411733cd311d0d30cc428a4a74fa111b6602 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:37 +0200 Subject: treewide: Mass replace 'libsamplerate}/lib' to refer the 'out' output --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cc7232f235d0..7132e8076aec 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6742,7 +6742,7 @@ in modules // { preConfigure = '' cat > site.cfg << END [samplerate] - library_dirs=${pkgs.libsamplerate}/lib + library_dirs=${pkgs.libsamplerate.out}/lib include_dirs=${pkgs.libsamplerate}/include END ''; -- cgit 1.4.1 From 052ce8112445710515f756e58b60ca3c1f0e0934 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:38 +0200 Subject: treewide: Mass replace 'libsndfile}/lib' to refer the 'out' output --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7132e8076aec..171a5f8b8ad8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14360,7 +14360,7 @@ in modules // { }; prePatch = '' - substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile}/lib/libsndfile.so'" + substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'" ''; # https://github.com/bastibe/PySoundFile/issues/157 -- cgit 1.4.1 From 3916cf476b363e072b27b25b86f5c8f706222e86 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:42 +0200 Subject: treewide: Mass replace 'libtiff}/lib' to refer the 'out' output --- pkgs/tools/graphics/netpbm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index e69a73ff321e..b39ae1dfd08f 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cp config.mk.in config.mk echo "STATICLIB_TOO = n" >> config.mk substituteInPlace "config.mk" \ - --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \ + --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" ''; -- cgit 1.4.1 From 69498299dd681fe773b474c3dec2d9b5bec468f0 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:44 +0200 Subject: treewide: Mass replace 'libusb1}/lib' to refer the 'out' output --- pkgs/applications/graphics/digikam/default.nix | 2 +- pkgs/development/mobile/flashtool/default.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index bdf8077624db..bc3678811a5b 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # Help digiKam find libusb, otherwise gphoto2 support is disabled cmakeFlags = [ - "-DLIBUSB_LIBRARIES=${libusb1}/lib" + "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0" "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" ]; diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index d22eeb6c2138..b33fc13224a3 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { buildPhase = '' ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux - ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so + ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 171a5f8b8ad8..289fec567f57 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22018,7 +22018,7 @@ in modules // { # Fix the USB backend library lookup postPatch = '' - libusb=${pkgs.libusb1}/lib/libusb-1.0.so + libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; } sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py ''; -- cgit 1.4.1 From 91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:45 +0200 Subject: treewide: Mass replace 'libusb}/lib' to refer the 'out' output --- pkgs/applications/misc/nut/default.nix | 2 +- pkgs/development/libraries/scmccid/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index 3e972f672cc2..25c904880923 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ - "$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib" + "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; meta = { diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index f9845d60b490..f88bd64f597b 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ patchelf ]; installPhase = '' - RPATH=${libusb}/lib:${stdenv.cc.libc.out}/lib + RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib for a in proprietary/*/Contents/Linux/*.so*; do if ! test -L $a; then -- cgit 1.4.1 From 5d52f5542604fad210a1b16484f31d2f8bb5ed39 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:49 +0200 Subject: treewide: Mass replace 'xorg.libX11}/lib' to refer the 'out' output --- nixos/modules/services/x11/window-managers/metacity.nix | 2 +- pkgs/applications/graphics/gimp/2.8.nix | 2 +- pkgs/development/tools/selenium/server/default.nix | 2 +- pkgs/os-specific/linux/ati-drivers/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 3e5229be634f..866bb441de45 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -20,7 +20,7 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/ + env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/lib:/usr/lib/ # !!! Hack: load the schemas for Metacity. GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \ --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */ diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 954a1d4c19c9..82c4bcbdc369 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { #configureFlags = [ "--disable-print" ]; # "screenshot" needs this. - NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib" + NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib" + stdenv.lib.optionalString stdenv.isDarwin " -lintl"; meta = { diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix index 2efd85f84010..66d9668fe82d 100644 --- a/pkgs/development/tools/selenium/server/default.nix +++ b/pkgs/development/tools/selenium/server/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64 patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \ + --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11.out}/lib" \ launchers/launcher-linux-${arch} ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch} ''; diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index bb0888855095..e9eba11513bd 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation { [ "${xorg.libXrandr}/lib" "${xorg.libXrender}/lib" "${xorg.libXext}/lib" - "${xorg.libX11}/lib" + "${xorg.libX11.out}/lib" "${xorg.libXinerama}/lib" ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 516b42a0274f..c4a4640a8b82 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12777,7 +12777,7 @@ let self = _self // overrides; _self = with self; { url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz"; sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa"; }; - makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib"; + makeMakerFlags = "X11LIB=${pkgs.xorg.libX11.out}/lib"; buildInputs = with pkgs; [ xorg.libX11 libpng ]; configurePhase = '' perl Makefile.PL PREFIX=$out $makeMakerFlags @@ -13219,7 +13219,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; -- cgit 1.4.1 From eec609fcc191857a44a200bc401d6c7f8a51d97f Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:50 +0200 Subject: treewide: Mass replace 'xorg.libxcb}/lib' to refer the 'out' output --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 289fec567f57..581e2834d8fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -23731,7 +23731,7 @@ in modules // { patchPhase = '' # Hardcode cairo library path - sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py + sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py ''; propagatedBuildInputs = [ self.cffi self.six ]; -- cgit 1.4.1 From 40ef23e7ed521abb7161dde01806ca62c9ed25ba Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:51 +0200 Subject: treewide: Mass replace 'xorg.libXext}/lib' to refer the 'out' output --- nixos/modules/services/x11/window-managers/metacity.nix | 2 +- pkgs/os-specific/linux/ati-drivers/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 866bb441de45..2957ad91be45 100644 --- a/nixos/modules/services/x11/window-managers/metacity.nix +++ b/nixos/modules/services/x11/window-managers/metacity.nix @@ -20,7 +20,7 @@ in services.xserver.windowManager.session = singleton { name = "metacity"; start = '' - env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/lib:/usr/lib/ + env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/ # !!! Hack: load the schemas for Metacity. GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \ --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */ diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index e9eba11513bd..277da6f6e4b5 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation { LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" [ "${xorg.libXrandr}/lib" "${xorg.libXrender}/lib" - "${xorg.libXext}/lib" + "${xorg.libXext.out}/lib" "${xorg.libX11.out}/lib" "${xorg.libXinerama}/lib" ]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c4a4640a8b82..053198bde2a4 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -13219,7 +13219,7 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ]; propagatedBuildInputs = [ InlineC ]; - patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; + patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; -- cgit 1.4.1 From 555292017e361206952acffda2641a59f7c8ae4b Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:53 +0200 Subject: treewide: Mass replace 'xorg.libXft}/lib' to refer the 'out' output --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 261529fd5239..7a7b603b449b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -2383,7 +2383,7 @@ let }); devEMF = old.devEMF.overrideDerivation (attrs: { - NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft"; + NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft"; }); slfm = old.slfm.overrideDerivation (attrs: { -- cgit 1.4.1 From 5a6a8213ebefade42f08bfba9ec94652631e0eb1 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:54 +0200 Subject: treewide: Mass replace 'xorg.libXinerama}/lib' to refer the 'out' output --- pkgs/os-specific/linux/ati-drivers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 277da6f6e4b5..7bc56a45fc4b 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { "${xorg.libXrender}/lib" "${xorg.libXext.out}/lib" "${xorg.libX11.out}/lib" - "${xorg.libXinerama}/lib" + "${xorg.libXinerama.out}/lib" ]; # without this some applications like blender don't start, but they start -- cgit 1.4.1 From 474f921bacefadaa7f123f7531adfa86062f4b0d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:57 +0200 Subject: treewide: Mass replace 'xorg.libXrandr}/lib' to refer the 'out' output --- pkgs/os-specific/linux/ati-drivers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 7bc56a45fc4b..67b98211099d 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { inherit glibc /* glibc only used for setting interpreter */; LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" - [ "${xorg.libXrandr}/lib" + [ "${xorg.libXrandr.out}/lib" "${xorg.libXrender}/lib" "${xorg.libXext.out}/lib" "${xorg.libX11.out}/lib" -- cgit 1.4.1 From 1894615f64502d66c2f5c4ad85e8ee50ee75cbf7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:29:57 +0200 Subject: treewide: Mass replace 'xorg.libXrender}/lib' to refer the 'out' output --- pkgs/os-specific/linux/ati-drivers/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 67b98211099d..c1e524e224bb 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation { LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" [ "${xorg.libXrandr.out}/lib" - "${xorg.libXrender}/lib" + "${xorg.libXrender.out}/lib" "${xorg.libXext.out}/lib" "${xorg.libX11.out}/lib" "${xorg.libXinerama.out}/lib" -- cgit 1.4.1 From 04c5830432165e60d5ef7bc77ea13618d9943fc5 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:00 +0200 Subject: treewide: Mass replace 'mpfr}/lib' to refer the 'out' output --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index a56d744ab8d4..ed7314878a6f 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -199,7 +199,7 @@ rec { rm -rf $out/include/c++/*/ext/parallel cp -d ${gmpxx}/lib/libgmp*.so* $out/lib - cp -d ${mpfr}/lib/libmpfr*.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 ${libelf}/lib/libelf.so* $out/lib diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 117346eb4edc..abcba396c371 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -112,7 +112,7 @@ rec { rm -rf $out/include/c++/*/ext/parallel cp -d ${gmpxx}/lib/libgmp*.so* $out/lib - cp -d ${mpfr}/lib/libmpfr*.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 ${libelf}/lib/libelf.so* $out/lib -- cgit 1.4.1 From 8eb5d7d037a484b6c33f035687a0cf22f2600128 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:01 +0200 Subject: treewide: Mass replace 'ncurses}/lib' to refer the 'lib' output --- pkgs/applications/editors/emacs-24/macport-24.5.nix | 4 ++-- pkgs/development/compilers/ghc/8.0.1.nix | 2 +- pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 +- pkgs/servers/sql/mariadb/default.nix | 2 +- pkgs/tools/system/gptfdisk/default.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix index c778c42de857..ae0a66b30fee 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "LDFLAGS=-L${ncurses}/lib" + "LDFLAGS=-L${ncurses.lib}/lib" "--with-xml2=yes" "--with-gnutls=yes" "--with-mac" @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ]; CFLAGS = "-O3"; - LDFLAGS = "-O3 -L${ncurses}/lib"; + LDFLAGS = "-O3 -L${ncurses.lib}/lib"; postInstall = '' mkdir -p $out/share/emacs/site-lisp/ diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index b262a448d4da..6e9f4691f73b 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.lib}/lib" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ]; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index d3f66c918ec7..ee649eb89b47 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -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 {} \; + --set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py do diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index f23a8f422b3b..340e29e94b3e 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals stdenv.isDarwin [ "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1" "-DWITHOUT_TOKUDB=1" - "-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib" + "-DCURSES_LIBRARY=${ncurses.lib}/lib/libncurses.dylib" ]; # fails to find lex_token.h sometimes diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix index 9306b0e84cca..18baf289e8cf 100644 --- a/pkgs/tools/system/gptfdisk/default.nix +++ b/pkgs/tools/system/gptfdisk/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.mac --replace \ " -I/opt/local/include -I /usr/local/include -I/opt/local/include" "" substituteInPlace Makefile.mac --replace \ - "/opt/local/lib/libncurses.a" "${ncurses}/lib/libncurses.dylib" + "/opt/local/lib/libncurses.a" "${ncurses.lib}/lib/libncurses.dylib" ''; buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac"; -- cgit 1.4.1 From 2258aecaa5e1b03b2f6def3bd79b769ee306ab9c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:03 +0200 Subject: treewide: Mass replace 'nss}/lib' to refer the 'out' output --- pkgs/development/libraries/liboauth/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix index 479a187cf87c..f62fb400199f 100644 --- a/pkgs/development/libraries/liboauth/default.nix +++ b/pkgs/development/libraries/liboauth/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/lib/liboauth.la \ - --replace "-lnss3" "-L${nss}/lib -lnss3" + --replace "-lnss3" "-L${nss.out}/lib -lnss3" ''; meta = with stdenv.lib; { -- cgit 1.4.1 From d91c7347d1f51ec0282a286e4eae69c13edd506a Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:05 +0200 Subject: treewide: Mass replace 'openssl}/lib' to refer the 'out' output --- nixos/modules/system/boot/luksroot.nix | 2 +- pkgs/applications/editors/sublime3/default.nix | 2 +- pkgs/applications/networking/ike/default.nix | 2 +- .../networking/instant-messengers/fuze/default.nix | 4 ++-- .../networking/instant-messengers/pybitmessage/default.nix | 2 +- pkgs/development/compilers/ponyc/default.nix | 4 ++-- pkgs/servers/nosql/arangodb/default.nix | 2 +- pkgs/servers/shellinabox/default.nix | 2 +- pkgs/tools/system/monit/default.nix | 2 +- pkgs/top-level/perl-packages.nix | 10 +++++----- 10 files changed, 16 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 59bff5472e84..6ea11e60b263 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -438,7 +438,7 @@ in copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo copy_bin_and_libs ${pkgs.openssl}/bin/openssl - cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto + cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto strip -s pbkdf2-sha512 copy_bin_and_libs pbkdf2-sha512 diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index c6cc813d6b11..5a1d10a1468c 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -57,7 +57,7 @@ in let --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects} # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so ''; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix index afb8c22272e4..5ea0975e15f3 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:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib" + wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib" done ''; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 33ffe87a4ffb..9ea2b5a56d1b 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -39,8 +39,8 @@ stdenv.mkDerivation { $f done - ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8 - ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8 + ln -s ${openssl.out}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8 + ln -s ${openssl.out}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8 ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze ''; diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix index c19b5ff31f9d..17462cb75ad5 100644 --- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix +++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { postInstall = '' substituteInPlace $out/bin/pybitmessage \ --replace "exec python2" "exec ${python}/bin/python" \ - --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl}/lib/" + --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/" wrapProgram $out/bin/pybitmessage \ --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" ''; diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index f05555003f98..076146095196 100644 --- a/pkgs/development/compilers/ponyc/default.nix +++ b/pkgs/development/compilers/ponyc/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; preCheck = '' - export LIBRARY_PATH="$out/lib:${openssl}/lib:${pcre2}/lib" + export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib" ''; installPhase = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation { mv $out/bin/ponyc $out/bin/ponyc.wrapped makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \ --prefix LIBRARY_PATH : "$out/lib" \ - --prefix LIBRARY_PATH : "${openssl}/lib" \ + --prefix LIBRARY_PATH : "${openssl.out}/lib" \ --prefix LIBRARY_PATH : "${pcre2}/lib" ''; diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 4ff12f630c9b..473b5d717dea 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { openssl zlib python gyp go readline ]; - configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ]; + configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ]; patchPhase = '' substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix index 0a651762f185..6df4905af2cd 100644 --- a/pkgs/servers/shellinabox/default.nix +++ b/pkgs/servers/shellinabox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/shellinaboxd \ - --prefix LD_LIBRARY_PATH : ${openssl}/lib + --prefix LD_LIBRARY_PATH : ${openssl.out}/lib mkdir -p $out/lib cp shellinabox/* $out/lib ''; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index 1b15fbbb6281..0ee32a49c07b 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-ssl-incl-dir=${openssl}/include" - "--with-ssl-lib-dir=${openssl}/lib" + "--with-ssl-lib-dir=${openssl.out}/lib" ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ]; meta = { diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 053198bde2a4..fb8bba33f374 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -2491,7 +2491,7 @@ let self = _self // overrides; _self = with self; { sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; meta = with stdenv.lib; { homepage = https://metacpan.org/release/Crypt-OpenSSL-AES; description = "Perl wrapper around OpenSSL's AES library"; @@ -2508,7 +2508,7 @@ let self = _self // overrides; _self = with self; { sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; CryptOpenSSLRandom = buildPerlPackage rec { @@ -2518,7 +2518,7 @@ let self = _self // overrides; _self = with self; { sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf"; }; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; CryptOpenSSLRSA = buildPerlPackage rec { @@ -2529,7 +2529,7 @@ let self = _self // overrides; _self = with self; { }; propagatedBuildInputs = [ CryptOpenSSLRandom ]; NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include"; - NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto"; + NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto"; }; CryptSSLeay = buildPerlPackage rec { @@ -2538,7 +2538,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz"; sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm"; }; - makeMakerFlags = "--libpath=${pkgs.openssl}/lib --incpath=${pkgs.openssl}/include"; + makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl}/include"; buildInputs = [ PathClass TryTiny ]; }; -- cgit 1.4.1 From ba87da9fd12a7fce91fa08f32dc2ebb6933eac1c Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:07 +0200 Subject: treewide: Mass replace 'pcre}/lib' to refer the 'out' output --- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index abcba396c371..1011ae6689ad 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -86,7 +86,7 @@ rec { cp ${curlMinimal}/bin/curl $out/bin cp -d ${curlMinimal}/lib/libcurl* $out/lib - cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep + cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep # Copy what we need of GCC. cp -d ${gcc.cc}/bin/gcc $out/bin -- cgit 1.4.1 From 619710268d1e0581f70d4d7c504b05e2d0b989a9 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:09 +0200 Subject: treewide: Mass replace 'poppler}/lib' to refer the 'out' output --- pkgs/applications/misc/pdfmod/default.nix | 2 +- pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 +- pkgs/tools/typesetting/tex/texlive/default.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index f23238b2dc61..12e3e696777d 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \ --prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \ --prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \ - --prefix LD_LIBRARY_PATH : ${poppler}/lib + --prefix LD_LIBRARY_PATH : ${poppler.out}/lib ''; dontStrip = true; diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix index 56b093f921d1..550870b0a6a9 100644 --- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix +++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix @@ -66,7 +66,7 @@ rec { # did the same thing in texLive, but couldn't get it to carry to the # binaries installed by texLiveFull for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" done '' ) [ "minInit" "defEnsureDir" "addInputs" ]; diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 008de2d25209..48a5ae8d6499 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -30,7 +30,7 @@ rec { setupHook = ./setup-hook.sh; doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin '' - export DYLD_LIBRARY_PATH="${poppler}/lib" + export DYLD_LIBRARY_PATH="${poppler.out}/lib" '' + '' mkdir -p $out mkdir -p $out/nix-support @@ -106,7 +106,7 @@ rec { PATH=$PATH:$out/bin mktexlsr $out/share/texmf* '' + stdenv.lib.optionalString stdenv.isDarwin '' for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib" + wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib" done '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"]; -- cgit 1.4.1 From 0f4244f51f1703132d9205a216180902a75bf33e Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:11 +0200 Subject: treewide: Mass replace 'poppler_utils}/lib' to refer the 'out' output --- pkgs/applications/misc/calibre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 62da092470ab..f464c3ccd027 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome export POPPLER_INC_DIR=${poppler_utils}/include/poppler - export POPPLER_LIB_DIR=${poppler_utils}/lib + export POPPLER_LIB_DIR=${poppler_utils.out}/lib export MAGICK_INC=${imagemagick}/include/ImageMagick export MAGICK_LIB=${imagemagick}/lib export FC_INC_DIR=${fontconfig.dev}/include/fontconfig -- cgit 1.4.1 From ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sun, 24 Jan 2016 09:30:24 +0200 Subject: treewide: Mass replace 'zlib}/lib' to refer the 'out' output --- pkgs/applications/audio/milkytracker/default.nix | 2 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/development/compilers/gcc/4.3/default.nix | 2 +- pkgs/development/libraries/tokyo-cabinet/default.nix | 2 +- pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 +- pkgs/development/ocaml-modules/camlzip/default.nix | 2 +- pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 2 +- pkgs/development/tools/build-managers/cargo/snapshot.nix | 2 +- pkgs/games/openttd/default.nix | 2 +- pkgs/servers/meteor/default.nix | 4 ++-- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +- pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +- pkgs/tools/filesystems/yandex-disk/default.nix | 2 +- pkgs/tools/graphics/pngcheck/default.nix | 2 +- pkgs/tools/networking/p2p/gtk-gnutella/default.nix | 2 +- 15 files changed, 16 insertions(+), 16 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix index 8bc0aebba5a8..f22ccd08a8e8 100644 --- a/pkgs/applications/audio/milkytracker/default.nix +++ b/pkgs/applications/audio/milkytracker/default.nix @@ -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 ]; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index e415239d76fb..e51813459c6f 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -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 = { diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index e97ae93cd531..317bd5eb3ed5 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -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 {}) diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 7512e085449c..b8969588b3c5 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -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' ''; diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index ee649eb89b47..a38d2d6b33cf 100644 --- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix +++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix @@ -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 diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix index 2024f5a5ab8f..60590c6c1d5f 100644 --- a/pkgs/development/ocaml-modules/camlzip/default.nix +++ b/pkgs/development/ocaml-modules/camlzip/default.nix @@ -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" ''; diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix index 20362a51a7be..9314481cbcfe 100644 --- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix +++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix @@ -12,7 +12,7 @@ buildPerlPackage rec { cat > config.in < Date: Sun, 24 Jan 2016 09:34:42 +0200 Subject: openttd: Fixup static zlib path --- pkgs/games/openttd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs') diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 471387320563..7411c161146e 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { prefixKey = "--prefix-dir="; configureFlags = [ - "--with-zlib=${zlib.out}/lib/libz.a" + "--with-zlib=${zlib.static}/lib/libz.a" "--without-liblzo2" ]; -- cgit 1.4.1