1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-09-11 15:08:33 +01:00

nixos/sddm: add layer-shell-qt to the wrapper when kwin is used

Otherwise the greeter just dies immediately.
This commit is contained in:
K900 2024-08-27 20:15:00 +03:00
parent 094e80f6ff
commit 363df5ad86
3 changed files with 7 additions and 2 deletions

View file

@ -8,6 +8,7 @@ let
sddm = cfg.package.override (old: {
withWayland = cfg.wayland.enable;
withLayerShellQt = cfg.wayland.compositor == "kwin";
extraPackages = old.extraPackages or [ ] ++ cfg.extraPackages;
});

View file

@ -2,16 +2,20 @@
lib,
callPackage,
runCommand,
layer-shell-qt,
qtwayland,
wrapQtAppsHook,
unwrapped ? callPackage ./unwrapped.nix {},
withWayland ? false,
withLayerShellQt ? false,
extraPackages ? [],
}:
runCommand "sddm-wrapped" {
inherit (unwrapped) version;
buildInputs = unwrapped.buildInputs ++ extraPackages ++ lib.optional withWayland qtwayland;
buildInputs = unwrapped.buildInputs ++ extraPackages
++ lib.optional withWayland qtwayland
++ lib.optional (withWayland && withLayerShellQt) layer-shell-qt;
nativeBuildInputs = [ wrapQtAppsHook ];
passthru = {

View file

@ -104,7 +104,7 @@ makeScopeWithSplicing' {
# Not a library, but we do want it to be built for every qt version there
# is, to allow users to choose the right build if needed.
sddm = callPackage ../applications/display-managers/sddm {};
sddm = kdePackages.callPackage ../applications/display-managers/sddm {};
sierra-breeze-enhanced = kdePackages.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { };