From 14d76affde509df26d61463ca4a00b897b9cb76c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 11 Oct 2010 19:59:22 +0000
Subject: [PATCH] Cleanup

svn path=/nixpkgs/trunk/; revision=24224
---
 pkgs/top-level/all-packages.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0630ed8d932..f9ebd98fe92 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5630,9 +5630,7 @@ let
 
   qcad = callPackage ../applications/misc/qcad { };
 
-  qjackctl = callPackage ../applications/audio/qjackctl {
-    qt4 = qt4;
-  };
+  qjackctl = callPackage ../applications/audio/qjackctl { };
 
   gkrellm = callPackage ../applications/misc/gkrellm { };
 
@@ -7004,11 +7002,7 @@ let
 
   polytable = callPackage ../misc/tex/polytable { };
 
-  psi = makeOverridable (callPackage ../applications/networking/instant-messengers/psi) {
-    qca2 = kde45.qca2;
-    qca2_ossl = kde45.qca2_ossl;
-    qt4 = qt47;
-  };
+  psi = newScope pkgs.kde45 ../applications/networking/instant-messengers/psi { };
 
   putty = callPackage ../applications/networking/remote/putty { };