MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-15 22:36:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

sddm: add Wayland to the wrapper if enabled

Browse source
This commit is contained in:
K900 2024-02-26 14:26:29 +03:00
parent 7b74d9a4ac
commit 2614e40893
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/services/x11/display-managers/sddm.nix
View file

@ -7,7 +7,10 @@ let
cfg = dmcfg.sddm;
xEnv = config.systemd.services.display-manager.environment;
sddm = cfg.package.override(old: { extraPackages = old.extraPackages or [] ++ cfg.extraPackages; });
sddm = cfg.package.override(old: {
withWayland = cfg.wayland.enable;
extraPackages = old.extraPackages or [] ++ cfg.extraPackages;
});
iniFmt = pkgs.formats.ini { };

5
pkgs/applications/display-managers/sddm/default.nix
View file

@ -1,14 +1,17 @@
{
lib,
callPackage,
runCommand,
qtwayland,
wrapQtAppsHook,
unwrapped ? callPackage ./unwrapped.nix {},
withWayland ? false,
extraPackages ? [],
}:
runCommand "sddm-wrapped" {
inherit (unwrapped) version;
buildInputs = unwrapped.buildInputs ++ extraPackages;
buildInputs = unwrapped.buildInputs ++ extraPackages ++ lib.optional withWayland qtwayland;
nativeBuildInputs = [ wrapQtAppsHook ];
passthru = {