diff options
| author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2020-12-25 23:02:18 +0100 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-07-02 16:50:09 -0400 |
| commit | 7e24e1e58d6f53d9c77f6015229d0c35f7e66bca (patch) | |
| tree | e78fd3f7d85832db187c862b39fdaad281652c41 /guix/build-system | |
| parent | 1879b05f90555c3401162eb7a0cc1cea0601e66c (diff) | |
| download | guix-patches-7e24e1e58d6f53d9c77f6015229d0c35f7e66bca.tar guix-patches-7e24e1e58d6f53d9c77f6015229d0c35f7e66bca.tar.gz | |
guix: qt-build-system, qt-utils: Unify wrapping of qt-programs.
Unify (guix qt-build-system wrap-all-programs) and
(guix qt-utils wrap-qt-program), so both behave the same.
The functions now reside in qt-utils to make them easily available for
packages not using the qt-build-system.
* guix/build/qt-build-system.scm (variables-for-wrapping, wrap-all-programs):
Move from here ...
* guix/build/qt-utils.scm (variables-for-wrapping, wrap-all-qt-programs):
... to here. Base the later on
(wrap-qt-program*): New function, carved out from old wrap-all-programs.
(wrap-qt-program): Base on wrap-qt-program*, change arguments in an
incompatible way.
* gnu/packages/bittorrent.scm (qbittorrent)[arguments]<phases>{wrap-qt}:
Adjust to new interface of wrap-qt-program.
* gnu/packages/finance.scm (electron-cash): Likewise.
* gnu/packages/geo.scm (qgis): Likewise.
* gnu/packages/password-utils.scm (qtpass): Likewise.
* gnu/packages/video.scm (openshot): Likewise.
* gnu/packages/web-browsers.scm (kristall): Likewise.
Diffstat (limited to 'guix/build-system')
| -rw-r--r-- | guix/build-system/qt.scm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index 118022ec45..1bd89bfa4d 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -53,6 +53,7 @@ (define %qt-build-system-modules ;; Build-side modules imported and used by default. `((guix build qt-build-system) + (guix build qt-utils) ,@%cmake-build-system-modules)) (define (default-cmake) |