Author: raskin
Date: Tue Aug 3 07:39:56 2010
New Revision: 22914
URL: https://svn.nixos.org/websvn/nix/?rev=22914&sc=1
Log:
Use updated QCA2 for psi
Modified:
nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Aug 3 07:35:29
2010 (r22913)
+++ nixpkgs/trunk/pkgs/desktops/kde-4.5/default.nix Tue Aug 3 07:39:56
2010 (r22914)
@@ -49,6 +49,7 @@
qca2_ossl = import ./support/qca2/ossl.nix {
inherit (pkgs) stdenv fetchurl qt4 openssl;
inherit qca2;
+ inherit (pkgs) fetchsvn;
};
### LIBS
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 3 07:35:29
2010 (r22913)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Aug 3 07:39:56
2010 (r22914)
@@ -6867,8 +6867,8 @@
polytable = callPackage ../misc/tex/polytable { };
psi = callPackage ../applications/networking/instant-messengers/psi {
- qca2 = kde4.qca2;
- qca2_ossl = kde4.qca2_ossl;
+ qca2 = kde45.qca2;
+ qca2_ossl = kde45.qca2_ossl;
};
putty = callPackage ../applications/networking/remote/putty {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
