diff options
| author | K900 <me@0upti.me> | 2023-10-03 12:48:48 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2023-10-03 12:48:58 +0300 |
| commit | d6537416aa7533e3138dae0e712f0ca4190116f8 (patch) | |
| tree | 59fdf48f9b6ff33ef5454c89f0899c42893f16f7 /pkgs/applications/display-managers | |
| parent | 876e774ce54fbdd21c649b12542bfca1ff06cf79 (diff) | |
| download | nixlib-d6537416aa7533e3138dae0e712f0ca4190116f8.tar nixlib-d6537416aa7533e3138dae0e712f0ca4190116f8.tar.gz nixlib-d6537416aa7533e3138dae0e712f0ca4190116f8.tar.bz2 nixlib-d6537416aa7533e3138dae0e712f0ca4190116f8.tar.lz nixlib-d6537416aa7533e3138dae0e712f0ca4190116f8.tar.xz nixlib-d6537416aa7533e3138dae0e712f0ca4190116f8.tar.zst nixlib-d6537416aa7533e3138dae0e712f0ca4190116f8.zip | |
sddm: backport a bunch of Wayland fixes
Diffstat (limited to 'pkgs/applications/display-managers')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 04826274bb69..94550f69d941 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkg-config, qttools , libxcb, libXau, pam, qtbase, qtdeclarative, qtquickcontrols2, systemd, xkeyboardconfig }: @@ -16,6 +16,25 @@ mkDerivation rec { patches = [ ./sddm-ignore-config-mtime.patch ./sddm-default-session.patch + + # FIXME: all of the following are Wayland related backports, drop in next release + # Don't use Qt virtual keyboard on Wayland + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/07631f2ef00a52d883d0fd47ff7d1e1a6bc6358f.patch"; + hash = "sha256-HTSw3YeT4z9ldr4sLmsnrPQ+LA8/a6XxrF+KUFqXUlM="; + }) + + # Fix running sddm-greeter manually in Wayland sessions + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/e27b70957505dc7b986ab2fa68219af546c63344.patch"; + hash = "sha256-6hzrFeS2epL9vzLOA29ZA/dD3Jd4rPMBHhNp+FBq1bA="; + }) + + # Prefer GreeterEnvironment over PAM environment + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/9e7791d5fb375933d20f590daba9947195515b26.patch"; + hash = "sha256-JNsVTJNZV6T+SPqPkaFf3wg8NDqXGx8NZ4qQfZWOli4="; + }) ]; postPatch = '' |