From 9ee523053704b30274f4817d1c7f63771e29e1b2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Sep 2011 22:49:13 +0000
Subject: Move qt3/qt4 choice to .nix expressions

svn path=/nixpkgs/trunk/; revision=29404
---
 pkgs/applications/science/electronics/qucs/default.nix | 4 ++--
 pkgs/tools/text/qshowdiff/default.nix                  | 6 +++---
 pkgs/top-level/all-packages.nix                        | 8 ++------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/electronics/qucs/default.nix b/pkgs/applications/science/electronics/qucs/default.nix
index 1218ad711805..979faa2e5977 100644
--- a/pkgs/applications/science/electronics/qucs/default.nix
+++ b/pkgs/applications/science/electronics/qucs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, qt, libX11}:
+{stdenv, fetchurl, qt3, libX11}:
 
 stdenv.mkDerivation rec {
   name = "qucs-0.0.15";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ggs2nicj8q270l0rbmzg4jc0d0zdxvfsjh4wgww670ma5855xsp";
   };
 
-  buildInputs = [ qt libX11 ];
+  buildInputs = [ qt3 libX11 ];
 
   meta = {
     description = "Integrated circuit simulator";
diff --git a/pkgs/tools/text/qshowdiff/default.nix b/pkgs/tools/text/qshowdiff/default.nix
index ee87bffc6729..d033cf4ba6f6 100644
--- a/pkgs/tools/text/qshowdiff/default.nix
+++ b/pkgs/tools/text/qshowdiff/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, qt, perl}:
+{stdenv, fetchurl, qt4, perl}:
 
 stdenv.mkDerivation rec {
   name = "qshowdiff-1.2";
   
   src = fetchurl {
-    url = http://qshowdiff.danfis.cz/files/qshowdiff-1.2.tar.gz;
+    url = "http://qshowdiff.danfis.cz/files/${name}.tar.gz";
     sha256 = "0i3ssvax4xync9c53jaxribazvh8d8v148l3yiqsfjmqsggw9rh3";
   };
 
-  buildInputs = [ qt perl ];
+  buildInputs = [ qt4 perl ];
 
   configurePhase = ''
     ensureDir $out/{bin,man/man1}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 31256e5e8feb..1074e52ac86f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1216,9 +1216,7 @@ let
 
   qhull = callPackage ../development/libraries/qhull { };
 
-  qshowdiff = callPackage ../tools/text/qshowdiff {
-    qt = qt4;
-  };
+  qshowdiff = callPackage ../tools/text/qshowdiff { };
 
   radvd = callPackage ../tools/networking/radvd { };
 
@@ -8130,9 +8128,7 @@ let
 
   ngspice = callPackage ../applications/science/electronics/ngspice { };
 
-  qucs = callPackage ../applications/science/electronics/qucs {
-    qt = qt3;
-  };
+  qucs = callPackage ../applications/science/electronics/qucs { };
 
   xoscope = callPackage ../applications/science/electronics/xoscope { };
 
-- 
cgit 1.4.1