From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:40024) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ibAoW-0004PQ-FN for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ibAoV-0001Lt-E5 for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57508) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ibAoV-0001Lo-Aq 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-0005k5-7s for guix-patches@gnu.org; Sat, 30 Nov 2019 17:02:03 -0500 Subject: [bug#38440] [PATCH 3/5] gnu: ktouch: Use qt-build-system. Resent-Message-ID: From: Hartmut Goebel Date: Sat, 30 Nov 2019 23:00:53 +0100 Message-Id: <20191130220055.19069-3-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 (ktouch): Use qt-build-sytem. [arguments]: Remove. : Base on phases from qt-build-system. {wrap-executables}: Remove. --- gnu/packages/education.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c84fa54223..5d49bfb42d 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -58,6 +58,7 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (srfi srfi-1)) @@ -563,15 +564,10 @@ language and very flexible regarding to new or unknown keyboard layouts.") (sha256 (base32 "19rdk94pls75hdvx11hnfk3qpm6l28p9q45q5f04sknxagrfaznr")))) - (build-system cmake-build-system) + (build-system qt-build-system) (arguments - `(#: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 + `(#:phases + (modify-phases (@ (guix build qt-build-system) %standard-phases) (add-after 'configure 'patch-makefiles (lambda* (#:key inputs #:allow-other-keys) (let ((qtdec (assoc-ref inputs "qtdeclarative"))) @@ -579,11 +575,6 @@ language and very flexible regarding to new or unknown keyboard layouts.") "src/CMakeFiles/ktouch.dir/build.make") (("/gnu/store/.*qmlcachegen") (string-append qtdec "/bin/qmlcachegen")))) - #t)) - (add-after 'install 'wrap-executable - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "ktouch")) #t))))) (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) -- 2.21.0