diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-15 18:59:39 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:15:52 +0100 |
| commit | 31d9263159b4689b29f1654c740eefe188199462 (patch) | |
| tree | c7db8b041ed0921a9c0692383871ecb56c861679 | |
| parent | 148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65 (diff) | |
| download | nixpkgs-31d9263159b4689b29f1654c740eefe188199462.tar nixpkgs-31d9263159b4689b29f1654c740eefe188199462.tar.gz nixpkgs-31d9263159b4689b29f1654c740eefe188199462.tar.bz2 nixpkgs-31d9263159b4689b29f1654c740eefe188199462.tar.lz nixpkgs-31d9263159b4689b29f1654c740eefe188199462.tar.xz nixpkgs-31d9263159b4689b29f1654c740eefe188199462.tar.zst nixpkgs-31d9263159b4689b29f1654c740eefe188199462.zip | |
some evaluation fixes
Not all multiple-output fixups were properly tested.
4 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index e8ebd82d0bf..233eb38ae86 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -22,7 +22,7 @@ pythonPackages.buildPythonPackage rec { postInstall = '' wrapProgram $out/bin/blink \ - --prefix LD_LIBRARY_PATH ":" ${gnutls.lib}/lib + --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix index cfd6ecd713d..3f9a2a1f2fb 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { for f in $(find $out); do if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath $out/lib:${gcc.lib}/lib:${ncurses.lib}/lib \ + --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.lib}/lib \ "$f" || true fi done diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 82345b86e96..40fa63d75ca 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""} ${if xftSupport then "-xft -L${libXft.out}/lib -I${libXft.dev}/include - -L${libXft.freetype.lib}/lib -I${libXft.freetype.dev}/include + -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include -L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"} "; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2db3fd1d432..4da776a9b50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -395,7 +395,7 @@ let postInstall = '' wrapProgram $out/bin/alot \ - --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}' + --prefix LD_LIBRARY_PATH : '${pkgs.lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}' ''; meta = { @@ -14692,7 +14692,7 @@ let # I don't know why I need to add these libraries. Shouldn't they # be part of wxPython? postInstall = '' - libspaths=${with pkgs.xorg; lib.makeLibraryPath [ libSM libXScrnSaver ]} + libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]} wrapProgram $out/bin/taskcoach.py \ --prefix LD_LIBRARY_PATH : $libspaths ''; |