From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 38711@debbugs.gnu.org
Cc: ludo@gnu.org
Subject: [bug#38711] [PATCH] build-system: qt: Actually use qt-build-system, not cmake-build-system.
Date: Sun, 22 Dec 2019 22:40:03 +0100 [thread overview]
Message-ID: <20191222214003.7352-1-h.goebel@crazy-compilers.com> (raw)
When the qt-build-system was created, based on the cmake-build-system,
some references to cmake have been missed to be changed.
* guix/build-system/qt.scm (qt-build, qt-cross-build)[modules]:
Use qt-build-system, not cmake-build-system. [builder]: Call qt-build,
not cmake-build.
---
guix/build-system/qt.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm
index b776845377..67fdfa1230 100644
--- a/guix/build-system/qt.scm
+++ b/guix/build-system/qt.scm
@@ -126,14 +126,14 @@
(qt-wrap-excluded-outputs ''())
(system (%current-system))
(imported-modules %qt-build-system-modules)
- (modules '((guix build cmake-build-system)
+ (modules '((guix build qt-build-system)
(guix build utils))))
"Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE
provides a 'CMakeLists.txt' file as its build system."
(define builder
`(begin
(use-modules ,@modules)
- (cmake-build #:source ,(match (assoc-ref inputs "source")
+ (qt-build #:source ,(match (assoc-ref inputs "source")
(((? derivation? source))
(derivation->output-path source))
((source)
@@ -208,7 +208,7 @@ provides a 'CMakeLists.txt' file as its build system."
(system (%current-system))
(build (nix-system->gnu-triplet system))
(imported-modules %qt-build-system-modules)
- (modules '((guix build cmake-build-system)
+ (modules '((guix build qt-build-system)
(guix build utils))))
"Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and
with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its
@@ -237,7 +237,7 @@ build system."
`(,name . ,path)))
target-drvs))
- (cmake-build #:source ,(match (assoc-ref native-drvs "source")
+ (qt-build #:source ,(match (assoc-ref native-drvs "source")
(((? derivation? source))
(derivation->output-path source))
((source)
--
2.21.1
next reply other threads:[~2019-12-22 21:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-22 21:40 Hartmut Goebel [this message]
2019-12-23 13:30 ` [bug#38711] [PATCH] build-system: qt: Actually use qt-build-system, not cmake-build-system Efraim Flashner
2019-12-23 16:50 ` bug#38711: " Hartmut Goebel
2019-12-23 16:54 ` [bug#38711] " Ludovic Courtès
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=20191222214003.7352-1-h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=38711@debbugs.gnu.org \
--cc=ludo@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).