Author: urkud
Date: Mon Oct 11 19:59:22 2010
New Revision: 24224
URL: https://svn.nixos.org/websvn/nix/?rev=24224&sc=1

Log:
Cleanup

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Mon Oct 11 19:59:17 
2010        (r24223)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Mon Oct 11 19:59:22 
2010        (r24224)
@@ -5630,9 +5630,7 @@
 
   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 @@
 
   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 { };
 
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits

Reply via email to