[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/05: gnu: sddm: Use qt-build-system.

From: guix-commits
Subject: 02/05: gnu: sddm: Use qt-build-system.
Date: Sun, 1 Dec 2019 14:26:38 -0500 (EST)

htgoebel pushed a commit to branch master
in repository guix.

commit 2f57e34bf37a4920dd3c9a0d0bf6d06dda3d57eb
Author: Hartmut Goebel <address@hidden>
Date:   Sat Nov 30 22:34:40 2019 +0100

    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.
 gnu/packages/display-managers.scm | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/display-managers.scm 
index 21afc0e..75eab48 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -27,6 +27,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system qt)
   #:use-module (guix build-system gnu)
   #:use-module (guix packages)
   #:use-module (guix utils)
@@ -62,7 +63,7 @@
-    (build-system cmake-build-system)
+    (build-system qt-build-system)
      `(("extra-cmake-modules" ,extra-cmake-modules)
        ("pkg-config" ,pkg-config)
@@ -105,24 +106,13 @@
                        (assoc-ref %outputs "out") "/lib/qt5/qml")
         (string-append "-DCMAKE_INSTALL_SYSCONFDIR="
                        (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))
-       (modify-phases %standard-phases
+       (modify-phases (@ (guix build qt-build-system) %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")))
-               (wrap-qt-program out "sddm")
-               (wrap-qt-program out "sddm-greeter")
-               #t))))))
+               #t)))))
     (synopsis "QML based X11 and Wayland display manager")
     (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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]