From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40015) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoW-0004PO-00 for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoU-0001Lh-V2 for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57507) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoU-0001Lb-RV for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibAoU-0005jy-PJ for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:02 -0500 Subject: [bug#38440] [PATCH 2/5] gnu: sddm: Use qt-build-system. Resent-Message-ID: From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:52 +0100 Message-Id: <20191130220055.19069-2-h.goebel@crazy-compilers.com> In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com> References: <20191130220055.19069-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 38440@debbugs.gnu.org * gnu/packages/display-managers.scm (sddm): Use qt-build-sytem. [arguments]: Remove. : 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 b/gnu/packages/display-managers.scm index 21afc0ec5c..75eab48572 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 @@ (sha256 (base32 "0nilrhwlyvkngjgxfc08n73c16azgmw80pvx0a78xqww9y3hv4xh")))) - (build-system cmake-build-system) + (build-system qt-build-system) (native-inputs `(("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)) #:phases - (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 -- 2.21.0