diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2021-10-02 14:54:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-02 14:54:27 -0500 |
| commit | 18e178040a8c3278da222ff9f8f15b9d44f0e569 (patch) | |
| tree | d476b1f65c472415bd477522de760c507ffd922d /pkgs/desktops | |
| parent | 810ed7a053191b5f8c9700dcf8b21eef5a28e887 (diff) | |
| parent | 2a4d13f8da47dd6ee6eb331adaf96127ca37ae75 (diff) | |
Merge pull request #138395 from alyssais/kde
plasma5Packages.ksysguard: remove if !allowAliases
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/plasma-5/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 7e1bb2b1092b1..e5a2393088865 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -24,9 +24,8 @@ existing packages here and modify it as necessary. */ -{ - libsForQt5, lib, fetchurl, - gconf, gsettings-desktop-schemas +{ libsForQt5, lib, config, fetchurl +, gconf, gsettings-desktop-schemas }: let @@ -123,7 +122,6 @@ let kscreen = callPackage ./kscreen.nix {}; kscreenlocker = callPackage ./kscreenlocker.nix {}; ksshaskpass = callPackage ./ksshaskpass.nix {}; - ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; ksystemstats = callPackage ./ksystemstats.nix {}; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; @@ -164,6 +162,8 @@ let parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { }; }; + } // lib.optionalAttrs (config.allowAliases or true) { + ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor"; }; in lib.makeScope libsForQt5.newScope packages |