diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index 3da6a81158d0..d766f6badfc7 100644 --- a/nixos/modules/security/apparmor-suid.nix +++ b/nixos/modules/security/apparmor-suid.nix @@ -29,8 +29,8 @@ with lib; network inet raw, ${pkgs.glibc.out}/lib/*.so mr, - ${pkgs.libcap}/lib/libcap.so* mr, - ${pkgs.attr}/lib/libattr.so* mr, + ${pkgs.libcap.out}/lib/libcap.so* mr, + ${pkgs.attr.out}/lib/libattr.so* mr, ${pkgs.iputils}/bin/ping mixr, /var/setuid-wrappers/ping.real r, 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/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/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 77427ce9606e..2e29ef6a8f53 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -121,7 +121,7 @@ in security.setuidOwners = singleton { program = "dbus-daemon-launch-helper"; - source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper"; + source = "${pkgs.dbus_daemon.lib}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix index 3e5229be634f..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}/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/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/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/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/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/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" \ 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/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/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 49c30a1f6d60..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}/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/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/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/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/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 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/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/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/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 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/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/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix index 3db8ee5f3ea7..317bd5eb3ed5 100644 --- a/pkgs/development/compilers/gcc/4.3/default.nix +++ b/pkgs/development/compilers/gcc/4.3/default.nix @@ -142,8 +142,8 @@ 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${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc}/lib -lgc@' + 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 {}) // (if langVhdl then rec { 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..6e9f4691f73b 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gcc=${stdenv.cc}/bin/cc" - "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" - "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/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/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 diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix index c94ba203c0ff..076146095196 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 ''; @@ -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/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; { 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 diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix index 0b210a589d41..b8969588b3c5 100644 --- a/pkgs/development/libraries/tokyo-cabinet/default.nix +++ b/pkgs/development/libraries/tokyo-cabinet/default.nix @@ -12,8 +12,8 @@ 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' + -e 's|-lz|-L${zlib.out}/lib -lz|g; + s|-lbz2|-L${bzip2.out}/lib -lbz2|g' ''; meta = { diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix index d3f66c918ec7..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 {} \; + --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/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/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 <> 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" ''; diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index 160badaf668b..d288e7018e60 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { # ''; makefile = "Makefile.unx"; - makeFlags = "ZPATH=${zlib}/lib"; + makeFlags = "ZPATH=${zlib.out}/lib"; buildInputs = [ zlib ]; diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index 5f335c8f76a9..ec2821f4d818 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -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"; 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"; 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/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"]; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index de1fcc4e27ec..fb8bba33f374 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 = { @@ -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 ]; }; @@ -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.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm''; meta = { description = "Get the idle time of X11"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a5fa5974cbf3..581e2834d8fd 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 = { @@ -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 = '' @@ -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 ''; @@ -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'" ''; }; @@ -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 @@ -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 = { @@ -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.out}/lib -L${pkgs.fftwLongDouble.out}/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 = { @@ -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 ''; @@ -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 ];