diff options
Diffstat (limited to 'pkgs/applications/display-managers/sddm/default.nix')
| -rw-r--r-- | pkgs/applications/display-managers/sddm/default.nix | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3ebeaa6262b..029501c7787 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, fetchFromGitHub -, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs +{ mkDerivation, lib, fetchFromGitHub, fetchpatch +, cmake, extra-cmake-modules, pkg-config, libxcb, libpthreadstubs , libXdmcp, libXau, qtbase, qtdeclarative, qtquickcontrols2, qttools, pam, systemd }: let - version = "0.18.1"; + version = "0.19.0"; in mkDerivation { pname = "sddm"; @@ -14,11 +14,17 @@ in mkDerivation { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "0an1zafz0yhxd9jgd3gzdwmaw5f9vs4c924q56lp2yxxddbmzjcq"; + sha256 = "1s6icb5r1n6grfs137gdzfrcvwsb3hvlhib2zh6931x8pkl1qvxa"; }; patches = [ ./sddm-ignore-config-mtime.patch + # Load `/etc/profile` for `environment.variables` with zsh default shell. + # See: https://github.com/sddm/sddm/pull/1382 + (fetchpatch { + url = "https://github.com/sddm/sddm/commit/e1dedeeab6de565e043f26ac16033e613c222ef9.patch"; + sha256 = "sha256-OPyrUI3bbH+PGDBfoL4Ohb4wIvmy9TeYZhE0JxR/D58="; + }) ]; postPatch = @@ -27,7 +33,7 @@ in mkDerivation { sed -e '1i#include <sys/time.h>' -i src/helper/HelperApp.cpp ''; - nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkg-config qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau pam qtbase qtdeclarative qtquickcontrols2 systemd |