kde5: build with Qt 5.5

This commit is contained in:
Thomas Tuegel 2015-12-23 17:03:21 -06:00
parent 354eb9e911
commit 558f14a094

View File

@ -14778,7 +14778,7 @@ let
apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self; merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
in in
recurseIntoAttrs (lib.makeScope qt5.newScope merged); recurseIntoAttrs (lib.makeScope qt55.newScope merged);
kde5_latest = kde5_latest =
let let
@ -14787,7 +14787,7 @@ let
apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self; merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self;
in in
recurseIntoAttrs (lib.makeScope qt5.newScope merged); recurseIntoAttrs (lib.makeScope qt55.newScope merged);
theme-vertex = callPackage ../misc/themes/vertex { }; theme-vertex = callPackage ../misc/themes/vertex { };