From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 38440@debbugs.gnu.org
Subject: [bug#38440] [PATCH 4/5] gnu: kdeconnect: Use qt-build-system.
Date: Sat, 30 Nov 2019 23:00:54 +0100 [thread overview]
Message-ID: <20191130220055.19069-4-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <20191130220055.19069-1-h.goebel@crazy-compilers.com>
* gnu/packages/display-managers.scm (kdeconnect): Use qt-build-sytem.
[arguments]<modules, imported-modules>: Remove. <phases>: 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
next prev 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 ` [bug#38440] [PATCH 3/5] gnu: ktouch: " Hartmut Goebel
2019-11-30 22:00 ` Hartmut Goebel [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191130220055.19069-4-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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.