* Set the QTDIR variable in a Qt setup hook.

svn path=/nixpkgs/trunk/; revision=2240

pkgs/applications/video/mythtv/builder.sh

@@ -1,7 +1,5 @@
 . $stdenv/setup
 
-export QTDIR=$qt3
-
 
 buildPhase=myBuilder
 myBuilder() {

pkgs/development/libraries/qt-3/builder.sh

@@ -1,4 +1,8 @@
 . $stdenv/setup
+. $substitute
+
+ensureDir $out/nix-support
+substitute "$hook" "$out/nix-support/setup-hook" --subst-var out
 
 
 preConfigure=preConfigure
@@ -9,11 +13,9 @@ preConfigure() {
     # will cause ./configure misdetections).
     for i in config.tests/unix/checkavail config.tests/*/*.test mkspecs/*/qmake.conf; do
         echo "patching $i..."
-        sed < $i > $i.tmp \
+        substituteInPlace "$i" \
-            -e 's^ /lib^ /FOO^g' \
+            --replace " /lib" " /FOO" \
-            -e 's^/usr^/FOO^g'
+            --replace "/usr" "/FOO"
-        if test -x $i; then chmod +x $i.tmp; fi
-        mv $i.tmp $i
     done
 }
 

pkgs/development/libraries/qt-3/default.nix

@@ -14,6 +14,8 @@ stdenv.mkDerivation {
   name = "qt-3.3.3";
 
   builder = ./builder.sh;
+  substitute = ../../../build-support/substitute/substitute.sh;
+  hook = ./setup-hook.sh;  
   src = fetchurl {
     url = http://catamaran.labs.cs.uu.nl/dist/tarballs/qt-x11-free-3.3.3.tar.bz2;
     md5 = "3e0a0c8429b0a974b39b5f535ddff01c";

pkgs/development/libraries/qt-3/setup-hook.sh

@@ -0,0 +1 @@
+export QTDIR=@out@