diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2010-08-03 07:39:56 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2010-08-03 07:39:56 +0000 |
| commit | 50f2d32ce9311dc251d27f4509af45e1e83e4156 (patch) | |
| tree | ac85286f6ec9e7d88df09381cd43cec61ef4190c /pkgs | |
| parent | a7adc46a3b7506f6420ad6e9dff7ae2b03a2522a (diff) | |
| download | nixlib-50f2d32ce9311dc251d27f4509af45e1e83e4156.tar nixlib-50f2d32ce9311dc251d27f4509af45e1e83e4156.tar.gz nixlib-50f2d32ce9311dc251d27f4509af45e1e83e4156.tar.bz2 nixlib-50f2d32ce9311dc251d27f4509af45e1e83e4156.tar.lz nixlib-50f2d32ce9311dc251d27f4509af45e1e83e4156.tar.xz nixlib-50f2d32ce9311dc251d27f4509af45e1e83e4156.tar.zst nixlib-50f2d32ce9311dc251d27f4509af45e1e83e4156.zip | |
Use updated QCA2 for psi
svn path=/nixpkgs/trunk/; revision=22914
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/kde-4.5/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix index 6bdae914ede1..230292a70777 100644 --- a/pkgs/desktops/kde-4.5/default.nix +++ b/pkgs/desktops/kde-4.5/default.nix @@ -49,6 +49,7 @@ pkgs.recurseIntoAttrs (rec { qca2_ossl = import ./support/qca2/ossl.nix { inherit (pkgs) stdenv fetchurl qt4 openssl; inherit qca2; + inherit (pkgs) fetchsvn; }; ### LIBS diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aab4d5995b10..05f8d3017b44 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6867,8 +6867,8 @@ let 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 { |