cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #138395 from alyssais/kde

Browse source 
plasma5Packages.ksysguard: remove if !allowAliases
This commit is contained in:
Thomas Tuegel 2021-10-02 14:54:27 -05:00 committed by GitHub
commit 18e178040a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/desktops/plasma-5/default.nix
View file

@ -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

2
pkgs/top-level/qt5-packages.nix
View file

@ -29,7 +29,7 @@ let
mkPlasma5 = import ../desktops/plasma-5;
attrs = {
inherit libsForQt5;
inherit (pkgs) lib fetchurl;
inherit (pkgs) config lib fetchurl;
gconf = pkgs.gnome2.GConf;
inherit (pkgs) gsettings-desktop-schemas;
};