From 31d9263159b4689b29f1654c740eefe188199462 Mon Sep 17 00:00:00 2001
From: Vladimír Čunát <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 18:59:39 +0200
Subject: some evaluation fixes

Not all multiple-output fixups were properly tested.
---
 pkgs/development/compilers/gcc-arm-embedded/default.nix | 2 +-
 pkgs/development/libraries/qt-3/default.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/development')

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