summaryrefslogtreecommitdiff
path: root/gnu/packages/display-managers.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-08-31 20:58:26 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-08-31 22:35:54 +0200
commitfa9f5222a9e4d809e72537babea02c83086b6a90 (patch)
tree6ad6fd0b05600b473a903f08b5df661e62ada6c8 /gnu/packages/display-managers.scm
parent76fed2b3c4e3703d1ad81c4330edd94d551b6334 (diff)
downloadpatches-fa9f5222a9e4d809e72537babea02c83086b6a90.tar
patches-fa9f5222a9e4d809e72537babea02c83086b6a90.tar.gz
gnu: sddm: Update to 0.15.0.
* gnu/packages/display-managers.scm (sddm): Update to 0.15.0. [source]: Update tarball name. [inputs]: Add ELOGIND. [arguments]: Adjust #:configure-flags for elogind support. Add phase to patch hard-coded loginctl reference.
Diffstat (limited to 'gnu/packages/display-managers.scm')
-rw-r--r--gnu/packages/display-managers.scm16
1 files changed, 12 insertions, 4 deletions
diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 869d6239ef..9f8d7b8250 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -132,23 +132,24 @@ Qt-style API for Wayland clients.")
(define-public sddm
(package
(name "sddm")
- (version "0.14.0")
+ (version "0.15.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/sddm/sddm"
"/releases/download/v" version "/"
- "sddm-" version ".tar.xz"))
+ "sddm-" version ".tar.gz"))
(sha256
(base32
- "0y3pn8g2qj7q20zkmbasrfsj925lfzizk63sfrvzf84bc5c84d3y"))))
+ "0x1igkjm3k8q26xbmg0qah1fc2pn2sfc675w0xg42x7ncrdiw8d4"))))
(build-system cmake-build-system)
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config)
("qttools" ,qttools)))
(inputs
- `(("glib" ,glib)
+ `(("elogind" ,elogind)
+ ("glib" ,glib)
("libxcb" ,libxcb)
("libxkbcommon" ,libxkbcommon)
("linux-pam" ,linux-pam)
@@ -163,6 +164,8 @@ Qt-style API for Wayland clients.")
;; Option added by enable wayland greeters PR
"-DENABLE_WAYLAND=ON"
"-DENABLE_PAM=ON"
+ ;; Both flags are required for elogind support.
+ "-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON"
"-DCONFIG_FILE=/etc/sddm.conf"
;; Set path to /etc/login.defs
;; Alternatively use -DUID_MIN and -DUID_MAX
@@ -180,6 +183,11 @@ Qt-style API for Wayland clients.")
(guix build qt-utils))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'embed-loginctl-reference
+ (lambda _
+ (substitute* "CMakeLists.txt"
+ (("/usr/bin/loginctl") (which "loginctl")))
+ #t))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))