guix: qt-build-system, qt-utils: Unify wrapping of qt-programs.
authorHartmut Goebel <h.goebel@crazy-compilers.com>
Fri, 25 Dec 2020 22:02:18 +0000 (23:02 +0100)
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>
Fri, 2 Jul 2021 20:50:09 +0000 (16:50 -0400)
commit7e24e1e58d6f53d9c77f6015229d0c35f7e66bca
treee78fd3f7d85832db187c862b39fdaad281652c41
parent1879b05f90555c3401162eb7a0cc1cea0601e66c
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.
gnu/packages/bittorrent.scm
gnu/packages/finance.scm
gnu/packages/geo.scm
gnu/packages/password-utils.scm
gnu/packages/video.scm
gnu/packages/web-browsers.scm
guix/build-system/qt.scm
guix/build/qt-build-system.scm
guix/build/qt-utils.scm