mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 19:21:04 +00:00
Code Issues Wiki Activity

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

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -104,7 +104,7 @@ makeScopeWithSplicing' {
# Not a library, but we do want it to be built for every qt version there # 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. # 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 { }; sierra-breeze-enhanced = kdePackages.callPackage ../data/themes/kwin-decorations/sierra-breeze-enhanced { };