State qt version (3/4) in packages, not in all-packages.nix

svn path=/nixpkgs/trunk/; revision=31406
2012-01-07 17:06:49 +00:00
parent d126fe5806
commit 7e320a7043
17 changed files with 53 additions and 79 deletions
--- a/pkgs/development/tools/misc/xxdiff/3.2.nix
+++ b/pkgs/development/tools/misc/xxdiff/3.2.nix
@@ -5,7 +5,7 @@ rec {
    sha256 = "1f5j9l9n5j2ab0h3iwaz0mnz0y8h7ilc0dbcrfmaibk2njx38mcn";
  };

-  buildInputs = [qt flex bison python pkgconfig makeWrapper 
+  buildInputs = [qt3 flex bison python pkgconfig makeWrapper 
    libX11 libXext];
  configureFlags = [];

@@ -20,7 +20,7 @@ rec {

  prepareMainBuild = fullDepEntry (''
    cd src 
-    export QTDIR=${qt}/
+    export QTDIR=${qt3}/
    make -f Makefile.bootstrap makefile
  '') ["minInit" "doUnpack"];