me/guix
Archived
1
0
Fork 0
Code Activity

gnu: sddm: Update to 0.15.0.

Browse source 
* 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.
This commit is contained in:
Marius Bakke 2017-08-31 20:58:26 +02:00
parent 76fed2b3c4
commit fa9f5222a9
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/display-managers.scm
View file

@ -132,23 +132,24 @@ Qt-style API for Wayland clients.")
(define-public sddm (define-public sddm
(package (package
(name "sddm") (name "sddm")
(version "0.14.0") (version "0.15.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"https://github.com/sddm/sddm" "https://github.com/sddm/sddm"
"/releases/download/v" version "/" "/releases/download/v" version "/"
"sddm-" version ".tar.xz")) "sddm-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0y3pn8g2qj7q20zkmbasrfsj925lfzizk63sfrvzf84bc5c84d3y")))) "0x1igkjm3k8q26xbmg0qah1fc2pn2sfc675w0xg42x7ncrdiw8d4"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(native-inputs (native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules) `(("extra-cmake-modules" ,extra-cmake-modules)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("qttools" ,qttools))) ("qttools" ,qttools)))
(inputs (inputs
`(("glib" ,glib) `(("elogind" ,elogind)
("glib" ,glib)
("libxcb" ,libxcb) ("libxcb" ,libxcb)
("libxkbcommon" ,libxkbcommon) ("libxkbcommon" ,libxkbcommon)
("linux-pam" ,linux-pam) ("linux-pam" ,linux-pam)
@ -163,6 +164,8 @@ Qt-style API for Wayland clients.")
;; Option added by enable wayland greeters PR ;; Option added by enable wayland greeters PR
"-DENABLE_WAYLAND=ON" "-DENABLE_WAYLAND=ON"
"-DENABLE_PAM=ON" "-DENABLE_PAM=ON"
;; Both flags are required for elogind support.
"-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON"
"-DCONFIG_FILE=/etc/sddm.conf" "-DCONFIG_FILE=/etc/sddm.conf"
;; Set path to /etc/login.defs ;; Set path to /etc/login.defs
;; Alternatively use -DUID_MIN and -DUID_MAX ;; Alternatively use -DUID_MIN and -DUID_MAX
@ -180,6 +183,11 @@ Qt-style API for Wayland clients.")
(guix build qt-utils)) (guix build qt-utils))
#:phases #:phases
(modify-phases %standard-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 (add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))