From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40037) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoW-0004RL-St for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoV-0001M3-SN for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57509) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoV-0001Ly-OZ for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ibAoV-0005kD-MO for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 Subject: [bug#38440] [PATCH 4/5] gnu: kdeconnect: Use qt-build-system. Resent-Message-ID: From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:54 +0100 Message-Id: <20191130220055.19069-4-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 (kdeconnect): Use qt-build-sytem. [arguments]: Remove. : Base on phases from qt-build-system. {wrap-executable}: Remove. --- gnu/packages/kde.scm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/gnu/packages/kde.scm b/gnu/packages/kde.scm index 778873e99c..a9cb6ad114 100644 --- a/gnu/packages/kde.scm +++ b/gnu/packages/kde.scm @@ -24,6 +24,7 @@ (define-module (gnu packages kde) #:use-module (guix build-system cmake) + #:use-module (guix build-system qt) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -540,28 +541,15 @@ different notification systems.") (sha256 (base32 "02lr3xx5s2mgddac4n3lkgr7ppf1z5m6ajs90rjix0vs8a271kp5")))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments `(#:configure-flags '("-DBUILD_TESTING=ON") #:tests? #f ; tests fail hard in our build environment - #: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-before 'check 'check-setup (lambda _ (setenv "QT_QPA_PLATFORM" "offscreen") - #t)) - (add-after 'install 'wrap-executable - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "../lib/libexec/kdeconnectd") - (wrap-qt-program out "kdeconnect-cli") - (wrap-qt-program out "kdeconnect-handler") - (wrap-qt-program out "kdeconnect-indicator")) #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- 2.21.0