ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-15 03:15:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-system: qt: Actually use qt-build-system, not cmake-build-system.

Browse source 
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 <ludo@gnu.org>
This commit is contained in:
Hartmut Goebel 2019-12-22 20:31:40 +01:00
parent 867383efbc
commit fce8ec9e15
No known key found for this signature in database
GPG key ID: 634A8DFFD3F631DF
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
guix/build-system/qt.scm
View file

@ -126,14 +126,14 @@ (define* (qt-build store name inputs
(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 @@ (define* (qt-cross-build store name
(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 @@ (define %build-target-inputs
`(,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)