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)
committerHartmut Goebel <h.goebel@crazy-compilers.com>
Fri, 29 Jan 2021 22:04:02 +0000 (23:04 +0100)
commit9085260fccd17955be6922c215f89be3e424dda3
tree84eb281aa5c3498335b4b8124d43af4b7146fd12
parent5aeee07cc922bdc605bb6cb7c2cd365d2d42f4d6
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