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

Merge #12607: mass-replace 'pkg}/lib'-style references

Browse Source 
... in strings to point to correct outputs.
This commit is contained in:
Vladimír Čunát 2016-01-28 12:51:59 +01:00
commit 66365b76dd
67 changed files with 116 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/security/apparmor-suid.nix
View File

@ -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,

2
nixos/modules/services/monitoring/graphite.nix
View File

@ -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 = ''

8
nixos/modules/services/printing/cupsd.nix
View File

@ -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 {

2
nixos/modules/services/system/dbus.nix
View File

@ -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;

2
nixos/modules/services/x11/window-managers/metacity.nix
View File

@ -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 # */

2
nixos/modules/system/boot/initrd-network.nix
View File

@ -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 ''

2
nixos/modules/system/boot/luksroot.nix
View File

@ -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

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

@ -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/"

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

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

6
pkgs/applications/editors/brackets/default.nix
View File

@ -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" \

4
pkgs/applications/editors/emacs-24/macport-24.5.nix
View File

@ -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/

2
pkgs/applications/editors/idea/common.nix
View File

@ -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

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

@ -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 {

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

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

2
pkgs/applications/graphics/digikam/default.nix
View File

@ -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"
];

2
pkgs/applications/graphics/gimp/2.8.nix
View File

@ -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 = {

2
pkgs/applications/misc/calibre/default.nix
View File

@ -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

2
pkgs/applications/misc/kiwix/default.nix
View File

@ -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 \

2
pkgs/applications/misc/nut/default.nix
View File

@ -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 = {

2
pkgs/applications/misc/pdfmod/default.nix
View File

@ -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;

2
pkgs/applications/networking/browsers/opera/default.nix
View File

@ -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

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

@ -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
'';

4
pkgs/applications/networking/instant-messengers/fuze/default.nix
View File

@ -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
'';

2
pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
View File

@ -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"
'';

2
pkgs/applications/video/avxsynth/default.nix
View File

@ -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 ];

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

@ -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 {

6
pkgs/development/compilers/ghc/7.4.2-binary.nix
View File

@ -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}"}
'';

4
pkgs/development/compilers/ghc/8.0.1.nix
View File

@ -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"
];

4
pkgs/development/compilers/opendylan/bin.nix
View File

@ -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

6
pkgs/development/compilers/ponyc/default.nix
View File

@ -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"
'';

2
pkgs/development/libraries/liboauth/default.nix
View File

@ -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; {

2
pkgs/development/libraries/scmccid/default.nix
View File

@ -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

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

@ -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 = {

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

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

2
pkgs/development/mobile/flashtool/default.nix
View File

@ -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

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

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

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

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

2
pkgs/development/r-modules/default.nix
View File

@ -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: {

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

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

2
pkgs/development/tools/selenium/server/default.nix
View File

@ -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}
'';

2
pkgs/games/dwarf-fortress/default.nix
View File

@ -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 }')

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

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

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

@ -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
'';

4
pkgs/misc/cups/drivers/mfcj470dw/default.nix
View File

@ -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

2
pkgs/os-specific/darwin/binutils/default.nix
View File

@ -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
'';

10
pkgs/os-specific/linux/ati-drivers/default.nix
View File

@ -63,11 +63,11 @@ stdenv.mkDerivation {
inherit glibc /* glibc only used for setting interpreter */;
LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
[ "${xorg.libXrandr}/lib"
"${xorg.libXrender}/lib"
"${xorg.libXext}/lib"
"${xorg.libX11}/lib"
"${xorg.libXinerama}/lib"
[ "${xorg.libXrandr.out}/lib"
"${xorg.libXrender.out}/lib"
"${xorg.libXext.out}/lib"
"${xorg.libX11.out}/lib"
"${xorg.libXinerama.out}/lib"
];
# without this some applications like blender don't start, but they start

2
pkgs/os-specific/linux/fusionio/util.nix
View File

@ -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

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

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

2
pkgs/servers/nosql/arangodb/default.nix
View File

@ -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

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

@ -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"

2
pkgs/servers/shellinabox/default.nix
View File

@ -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
'';

2
pkgs/servers/sql/mariadb/default.nix
View File

@ -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

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

@ -199,9 +199,9 @@ 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 ${zlib.out}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib
# TBD: Why are these needed for cross but not native tools?
@ -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

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

@ -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
@ -112,16 +112,16 @@ 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 ${zlib.out}/lib/libz.so* $out/lib
cp -d ${libelf}/lib/libelf.so* $out/lib
# Copy binutils.
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

2
pkgs/tools/filesystems/xtreemfs/default.nix
View File

@ -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"

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

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

6
pkgs/tools/graphics/graphviz/2.0.nix
View File

@ -16,11 +16,11 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng}/lib"
"--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include"
"--with-jpeglibdir=${libjpeg}/lib"
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
"--with-expatlibdir=${expat.out}/lib"
]
++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";

6
pkgs/tools/graphics/graphviz/2.32.nix
View File

@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
configureFlags =
[ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng}/lib"
"--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include"
"--with-jpeglibdir=${libjpeg}/lib"
"--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat}/include"
"--with-expatlibdir=${expat}/lib"
"--with-expatlibdir=${expat.out}/lib"
"--with-cgraph=no"
"--with-sparse=no"
]

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

@ -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"
'';

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

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

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

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

2
pkgs/tools/system/gptfdisk/default.nix
View File

@ -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";

2
pkgs/tools/system/monit/default.nix
View File

@ -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 = {

2
pkgs/tools/typesetting/tex/texlive/aggregate.nix
View File

@ -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" ];

4
pkgs/tools/typesetting/tex/texlive/default.nix
View File

@ -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"];

16
pkgs/top-level/perl-packages.nix
View File

@ -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";
};

20
pkgs/top-level/python-packages.nix
View File

@ -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 ];