about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2010-04-01 14:21:18 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2010-04-01 14:21:18 +0000
commit16ef66f67ed432fa334bd9f16570ae6cf0a65e6b (patch)
tree0af59391492f36a5f06bf19e2d20d36c8d27f514
parent94de02e04e911edfc960d7a88827a1f7fbc389fc (diff)
downloadnixlib-16ef66f67ed432fa334bd9f16570ae6cf0a65e6b.tar
nixlib-16ef66f67ed432fa334bd9f16570ae6cf0a65e6b.tar.gz
nixlib-16ef66f67ed432fa334bd9f16570ae6cf0a65e6b.tar.bz2
nixlib-16ef66f67ed432fa334bd9f16570ae6cf0a65e6b.tar.lz
nixlib-16ef66f67ed432fa334bd9f16570ae6cf0a65e6b.tar.xz
nixlib-16ef66f67ed432fa334bd9f16570ae6cf0a65e6b.tar.zst
nixlib-16ef66f67ed432fa334bd9f16570ae6cf0a65e6b.zip
Recurse into kde4 attrs
svn path=/nixpkgs/trunk/; revision=20912
-rw-r--r--pkgs/top-level/all-packages.nix7
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f2495134c7a..900f191146f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8811,7 +8811,12 @@ let
 
   };
 
-  kde4 = kde44;
+  kde4 = recurseIntoAttrs (
+    if (getPkgConfig "kde" "version" "4.4") == "4.4" then
+      kde44
+    else
+      kde43
+  );
 
   kde43 = makeOverridable (import ../desktops/kde-4.3) (pkgs // {
     openexr = openexr_1_6_1;