From 3049b6788b2c59bfc150c7cec9033d15a98139b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Jul 2011 19:56:01 +0000
Subject: [PATCH] * Doh, cmake doesn't extrapolate $(out).

svn path=/nixpkgs/branches/kde-4.7/; revision=27640
---
 .../development/libraries/qt-4.x/4.7/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.7/default.nix b/pkgs/development/libraries/qt-4.x/4.7/default.nix
index 98e460c65ef..e84c57501dc 100644
--- a/pkgs/development/libraries/qt-4.x/4.7/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.7/default.nix
@@ -23,6 +23,15 @@ stdenv.mkDerivation rec {
   preConfigure =
     ''
       export LD_LIBRARY_PATH="`pwd`/lib:$LD_LIBRARY_PATH"
+      configureFlags+="
+        -docdir $out/share/doc/${name}
+        -plugindir $out/lib/qt4/plugins
+        -importdir $out/lib/qt4/imports
+        -examplesdir $out/share/doc/${name}/examples
+        -demosdir $out/share/doc/${name}/demos
+        -datadir $out/share/${name}
+        -translationdir $out/share/${name}/translations
+      "
     '';
 
   configureFlags =
@@ -40,13 +49,6 @@ stdenv.mkDerivation rec {
       ${if buildDemos == true then "-make demos" else "-nomake demos"}
       ${if buildExamples == true then "-make examples" else "-nomake examples"}
       ${if useDocs then "-make docs" else "-nomake docs"}
-      -docdir $out/share/doc/${name}
-      -plugindir $out/lib/qt4/plugins
-      -importdir $out/lib/qt4/imports
-      -examplesdir $out/share/doc/${name}/examples
-      -demosdir $out/share/doc/${name}/demos
-      -datadir $out/share/${name}
-      -translationdir $out/share/${name}/translations
     '';
 
   propagatedBuildInputs = [