diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-10-11 19:59:22 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-10-11 19:59:22 +0000 |
commit | 14d76affde509df26d61463ca4a00b897b9cb76c (patch) | |
tree | 22bddb60144e71c771300709b38d1ec0b0f9e299 /pkgs | |
parent | 4aa443bd0f80384e621a277251186ef6fba9f1ad (diff) | |
download | nixlib-14d76affde509df26d61463ca4a00b897b9cb76c.tar nixlib-14d76affde509df26d61463ca4a00b897b9cb76c.tar.gz nixlib-14d76affde509df26d61463ca4a00b897b9cb76c.tar.bz2 nixlib-14d76affde509df26d61463ca4a00b897b9cb76c.tar.lz nixlib-14d76affde509df26d61463ca4a00b897b9cb76c.tar.xz nixlib-14d76affde509df26d61463ca4a00b897b9cb76c.tar.zst nixlib-14d76affde509df26d61463ca4a00b897b9cb76c.zip |
Cleanup
svn path=/nixpkgs/trunk/; revision=24224
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0630ed8d9328..f9ebd98fe926 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 { }; |