summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorambrop7@gmail.com <Ambroz Bizjak>2014-09-20 11:09:11 +0200
committerambrop7@gmail.com <Ambroz Bizjak>2014-09-24 23:48:38 +0200
commit8fef5ed67560fc75b136b8c74899e1b69e9d6c8a (patch)
tree69319b98d1a7a8694ed29fa8aee02dceea62bda9 /pkgs/top-level
parent46802fb67d8c0fcc4f33cbb9cf6a37d248a8b403 (diff)
downloadnixlib-8fef5ed67560fc75b136b8c74899e1b69e9d6c8a.tar
nixlib-8fef5ed67560fc75b136b8c74899e1b69e9d6c8a.tar.gz
nixlib-8fef5ed67560fc75b136b8c74899e1b69e9d6c8a.tar.bz2
nixlib-8fef5ed67560fc75b136b8c74899e1b69e9d6c8a.tar.lz
nixlib-8fef5ed67560fc75b136b8c74899e1b69e9d6c8a.tar.xz
nixlib-8fef5ed67560fc75b136b8c74899e1b69e9d6c8a.tar.zst
nixlib-8fef5ed67560fc75b136b8c74899e1b69e9d6c8a.zip
kde: Copy 4.12 to 4.14 as a base"
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix8
1 files changed, 7 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82b06349a8db..6731759930ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11101,7 +11101,7 @@ let
 
   kde4 = recurseIntoAttrs pkgs.kde412;
 
-  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
+  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde414 );
 
   kde412 = kdePackagesFor (pkgs.kde412 // {
       eigen = eigen2;
@@ -11109,6 +11109,12 @@ let
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.12;
 
+  kde414 = kdePackagesFor (pkgs.kde414 // {
+      eigen = eigen2;
+      libusb = libusb1;
+      libcanberra = libcanberra_kde;
+    }) ../desktops/kde-4.14;
+
   kdePackagesFor = self: dir:
     let callPackageOrig = callPackage; in
     let