Merge pull request #138395 from alyssais/kde
plasma5Packages.ksysguard: remove if !allowAliases
This commit is contained in:
commit
18e178040a
|
@ -24,9 +24,8 @@ existing packages here and modify it as necessary.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
{
|
{ libsForQt5, lib, config, fetchurl
|
||||||
libsForQt5, lib, fetchurl,
|
, gconf, gsettings-desktop-schemas
|
||||||
gconf, gsettings-desktop-schemas
|
|
||||||
}:
|
}:
|
||||||
|
|
||||||
let
|
let
|
||||||
|
@ -123,7 +122,6 @@ let
|
||||||
kscreen = callPackage ./kscreen.nix {};
|
kscreen = callPackage ./kscreen.nix {};
|
||||||
kscreenlocker = callPackage ./kscreenlocker.nix {};
|
kscreenlocker = callPackage ./kscreenlocker.nix {};
|
||||||
ksshaskpass = callPackage ./ksshaskpass.nix {};
|
ksshaskpass = callPackage ./ksshaskpass.nix {};
|
||||||
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
|
|
||||||
ksystemstats = callPackage ./ksystemstats.nix {};
|
ksystemstats = callPackage ./ksystemstats.nix {};
|
||||||
kwallet-pam = callPackage ./kwallet-pam.nix {};
|
kwallet-pam = callPackage ./kwallet-pam.nix {};
|
||||||
kwayland-integration = callPackage ./kwayland-integration.nix {};
|
kwayland-integration = callPackage ./kwayland-integration.nix {};
|
||||||
|
@ -164,6 +162,8 @@ let
|
||||||
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
|
parachute = callPackage ./3rdparty/kwin/scripts/parachute.nix { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
} // lib.optionalAttrs (config.allowAliases or true) {
|
||||||
|
ksysguard = throw "ksysguard has been replaced with plasma-systemmonitor";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
lib.makeScope libsForQt5.newScope packages
|
lib.makeScope libsForQt5.newScope packages
|
||||||
|
|
|
@ -29,7 +29,7 @@ let
|
||||||
mkPlasma5 = import ../desktops/plasma-5;
|
mkPlasma5 = import ../desktops/plasma-5;
|
||||||
attrs = {
|
attrs = {
|
||||||
inherit libsForQt5;
|
inherit libsForQt5;
|
||||||
inherit (pkgs) lib fetchurl;
|
inherit (pkgs) config lib fetchurl;
|
||||||
gconf = pkgs.gnome2.GConf;
|
gconf = pkgs.gnome2.GConf;
|
||||||
inherit (pkgs) gsettings-desktop-schemas;
|
inherit (pkgs) gsettings-desktop-schemas;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue