guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/07: build-system: qt: Actually use qt-build-system, not cmake-build-s


From: guix-commits
Subject: 01/07: build-system: qt: Actually use qt-build-system, not cmake-build-system.
Date: Mon, 23 Dec 2019 11:50:21 -0500 (EST)

htgoebel pushed a commit to branch master
in repository guix.

commit fce8ec9e1514a25f3698553449635a2fe5d80811
Author: Hartmut Goebel <address@hidden>
Date:   Sun Dec 22 20:31:40 2019 +0100

    build-system: qt: Actually use qt-build-system, not cmake-build-system.
    
    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.
    
    Coauthored-by: Ludovic Court├Ęs <address@hidden>
---
 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 b776845..67fdfa1 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]