me
/
guix
Archived
1
0
Fork 0
Code

gnu: sddm: Use qt-build-system. 

* gnu/packages/display-managers.scm (sddm): Use qt-build-sytem.
  [arguments]<modules, imported-modules>: Remove. <phases>: Base
  on phases from qt-build-system. {wrap-programs}: Remove.
master
Hartmut Goebel 2019-11-30 22:34:40 +01:00
parent b6d852ce6d
commit 2f57e34bf3
No known key found for this signature in database
GPG Key ID: 634A8DFFD3F631DF
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/display-managers.scm
View File

@ -27,6 +27,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
#:use-module (guix build-system qt)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
@ -62,7 +63,7 @@
(sha256 (sha256
(base32 (base32
"0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh")))) "0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh"))))
(build-system cmake-build-system) (build-system qt-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)
@ -105,24 +106,13 @@
(assoc-ref %outputs "out") "/lib/qt5/qml") (assoc-ref %outputs "out") "/lib/qt5/qml")
(string-append "-DCMAKE_INSTALL_SYSCONFDIR=" (string-append "-DCMAKE_INSTALL_SYSCONFDIR="
(assoc-ref %outputs "out") "/etc")) (assoc-ref %outputs "out") "/etc"))
#:modules ((guix build cmake-build-system)
(guix build qt-utils)
(guix build utils))
#:imported-modules (,@%cmake-build-system-modules
(guix build qt-utils))
#:phases #:phases
(modify-phases %standard-phases (modify-phases (@ (guix build qt-build-system) %standard-phases)
(add-after 'unpack 'embed-loginctl-reference (add-after 'unpack 'embed-loginctl-reference
(lambda _ (lambda _
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("/usr/bin/loginctl") (which "loginctl"))) (("/usr/bin/loginctl") (which "loginctl")))
#t)) #t)))))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-qt-program out "sddm")
(wrap-qt-program out "sddm-greeter")
#t))))))
(synopsis "QML based X11 and Wayland display manager") (synopsis "QML based X11 and Wayland display manager")
(description "SDDM is a display manager for X11 and Wayland aiming to be (description "SDDM is a display manager for X11 and Wayland aiming to be
fast, simple and beautiful. SDDM is themeable and puts no restrictions on the fast, simple and beautiful. SDDM is themeable and puts no restrictions on the