diff options
| author | K900 <me@0upti.me> | 2024-02-26 14:26:29 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-02-28 18:49:33 +0300 |
| commit | 2614e40893ef27d0bcda0d475cb732c47c331b78 (patch) | |
| tree | 170ed73cc0d8062b1f470675377107995bee2172 | |
| parent | 7b74d9a4acf3cad61612a83dccb115eaec06fb1a (diff) | |
sddm: add Wayland to the wrapper if enabled
| -rw-r--r-- | nixos/modules/services/x11/display-managers/sddm.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index d556bcc8b163..5b7f4bc58d80 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -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 { }; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index d565d2d1213f..2708ff060814 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -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 = { |