From patchwork Sat Nov 30 22:00:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 16321 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7A38917824; Sat, 30 Nov 2019 22:02:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4166617811 for ; Sat, 30 Nov 2019 22:02:14 +0000 (GMT) Received: from localhost ([::1]:38634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAof-0004X0-N6 for patchwork@mira.cbaines.net; Sat, 30 Nov 2019 17:02:13 -0500 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 X-Loop: help-debbugs@gnu.org Subject: [bug#38440] [PATCH 2/5] gnu: sddm: Use qt-build-system. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Nov 2019 22:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38440 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38440@debbugs.gnu.org Received: via spool by 38440-submit@debbugs.gnu.org id=B38440.157515127121959 (code B ref 38440); Sat, 30 Nov 2019 22:02:02 +0000 Received: (at 38440) by debbugs.gnu.org; 30 Nov 2019 22:01:11 +0000 Received: from localhost ([127.0.0.1]:35238 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnf-0005i2-Bx for submit@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:11 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:37611) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ibAnZ-0005hj-Lt for 38440@debbugs.gnu.org; Sat, 30 Nov 2019 17:01:06 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47QQLT0xFdz1qqkb for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:05 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47QQLT0krTz1qwZJ for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:05 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id Ggpa9OJnWyWz for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:04 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-57-47.dynamic.mnet-online.de [188.174.57.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:04 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 10BC960236 for <38440@debbugs.gnu.org>; Sat, 30 Nov 2019 23:01:32 +0100 (CET) From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:52 +0100 Message-Id: <20191130220055.19069-2-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com> References: <20191130220055.19069-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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