From 965cfccfa509f3e513e0bceecfded742b3286c93 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 23 Dec 2015 18:03:55 -0600 Subject: [PATCH] kde5: add attributes for individual KDE collections --- pkgs/top-level/all-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e547fade718..8be89661b67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14776,7 +14776,9 @@ let frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; - merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self; + named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; + merged = self: + named self // frameworks self // plasma self // apps self // kde5PackagesFun self; in recurseIntoAttrs (lib.makeScope qt55.newScope merged); @@ -14785,7 +14787,9 @@ let frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; - merged = self: frameworks self // plasma self // apps self // kde5PackagesFun self; + named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; + merged = self: + named self // frameworks self // plasma self // apps self // kde5PackagesFun self; in recurseIntoAttrs (lib.makeScope qt55.newScope merged);