unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 38440@debbugs.gnu.org
Subject: [bug#38440] [PATCH 3/5] gnu: ktouch: Use qt-build-system.
Date: Sat, 30 Nov 2019 23:00:53 +0100	[thread overview]
Message-ID: <20191130220055.19069-3-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com>

* gnu/packages/display-managers.scm (ktouch): Use qt-build-sytem.
  [arguments]<modules, imported-modules>: Remove. <phases>: 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

  parent reply	other threads:[~2019-11-30 22:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-30 21:59 [bug#38440] [PATCH 0/5] Add the `qt` build-system Hartmut Goebel
2019-11-30 22:00 ` [bug#38440] [PATCH 1/5] guix: Add the 'qt' build system Hartmut Goebel
2019-11-30 22:00   ` [bug#38440] [PATCH 2/5] gnu: sddm: Use qt-build-system Hartmut Goebel
2019-11-30 22:00   ` Hartmut Goebel [this message]
2019-11-30 22:00   ` [bug#38440] [PATCH 4/5] gnu: kdeconnect: " Hartmut Goebel
2019-11-30 22:00   ` [bug#38440] [PATCH 5/5] gnu: quaternion: " Hartmut Goebel
2019-11-30 22:15 ` [bug#38440] [PATCH 0/5] Add the `qt` build-system Brett Gilio
2019-12-01 19:28   ` bug#38440: " Hartmut Goebel
2019-11-30 22:17 ` [bug#38440] [PATCH v2] guix: Add the 'qt' build system Hartmut Goebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191130220055.19069-3-h.goebel@crazy-compilers.com \
    --to=h.goebel@crazy-compilers.com \
    --cc=38440@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).