some evaluation fixes

Not all multiple-output fixups were properly tested.

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

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

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

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