git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #138395 from alyssais/kde

plasma5Packages.ksysguard: remove if !allowAliases

commit18e178040a8c3278da222ff9f8f15b9d44f0e569 authorThomas Tuegel <ttuegel@mailbox.org> dateSat 2 Oct 2021, 14:54 (5 years ago) parent810ed7a2a4d13f
2 files changed+5−5
pkgs/desktops/plasma-5/default.nix+4−4 pkgs/top-level/qt5-packages.nix+1−1
pkgs/desktops/plasma-5/default.nix+4−4
@@ -24,9 +24,8 @@ existing packages here and modify it as necessary.
2424
2525*/
2626
27−{
28− libsForQt5, lib, fetchurl,
29− gconf, gsettings-desktop-schemas
27+{ libsForQt5, lib, config, fetchurl
28+, gconf, gsettings-desktop-schemas
3029}:
3130
3231let
@@ -123,7 +122,6 @@ let
123122 kscreen = callPackage ./kscreen.nix {};
124123 kscreenlocker = callPackage ./kscreenlocker.nix {};
125124 ksshaskpass = callPackage ./ksshaskpass.nix {};
126− ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
127125 ksystemstats = callPackage ./ksystemstats.nix {};
128126 kwallet-pam = callPackage ./kwallet-pam.nix {};
129127 kwayland-integration = callPackage ./kwayland-integration.nix {};
@@ -164,6 +162,8 @@ let
164162 parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
165163 };
166164
165+ } // lib.optionalAttrs (config.allowAliases or true) {
166+ ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
167167 };
168168in
169169lib.makeScope libsForQt5.newScope packages
pkgs/top-level/qt5-packages.nix+1−1
@@ -29,7 +29,7 @@ let
2929 mkPlasma5 = import ../desktops/plasma-5;
3030 attrs = {
3131 inherit libsForQt5;
32− inherit (pkgs) lib fetchurl;
32+ inherit (pkgs) config lib fetchurl;
3333 gconf = pkgs.gnome2.GConf;
3434 inherit (pkgs) gsettings-desktop-schemas;
3535 };