gnu: qbittorrent{,-nox}: Use qt-build-system.
CMake is now upstream’s preferred build system. * gnu/packages/bittorrent.scm (qbittorrent)[build-system]: Use qt-build-system. [arguments]: Drop custom wrap phase. (Re-)enable tests. [inputs]: Remove input labels. Drop qtbase-5. [native-inputs]: Drop pkg-config. (qbittorrent-nox)[arguments]: Adjust configure-flags. Keep the wrap-qt phase since the non-GUI version is also a QT program. Signed-off-by: Ludovic Courtès <ludo@gnu.org>master
parent
f561e8a0ed
commit
09d1e04230
|
@ -40,6 +40,7 @@
|
||||||
#:use-module (guix build-system cmake)
|
#:use-module (guix build-system cmake)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system python)
|
#:use-module (guix build-system python)
|
||||||
|
#:use-module (guix build-system qt)
|
||||||
#:use-module (guix build-system glib-or-gtk)
|
#:use-module (guix build-system glib-or-gtk)
|
||||||
#:use-module ((guix licenses) #:prefix l:)
|
#:use-module ((guix licenses) #:prefix l:)
|
||||||
#:use-module (guix gexp)
|
#:use-module (guix gexp)
|
||||||
|
@ -461,36 +462,19 @@ desktops.")
|
||||||
(file-name (git-file-name name version))
|
(file-name (git-file-name name version))
|
||||||
(sha256
|
(sha256
|
||||||
(base32 "1r4vqlwmvg7b0ibq53m7ascyykv3v66qxlwfi0zmmi1ig7rlkxkk"))))
|
(base32 "1r4vqlwmvg7b0ibq53m7ascyykv3v66qxlwfi0zmmi1ig7rlkxkk"))))
|
||||||
(build-system gnu-build-system)
|
(build-system qt-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
`(#:configure-flags
|
(list #:configure-flags #~(list "-DTESTING=ON")
|
||||||
(list (string-append "--with-boost-libdir="
|
#:test-target "check"))
|
||||||
(assoc-ref %build-inputs "boost")
|
|
||||||
"/lib")
|
|
||||||
"--enable-debug"
|
|
||||||
"QMAKE_LRELEASE=lrelease")
|
|
||||||
#:modules ((guix build gnu-build-system)
|
|
||||||
(guix build qt-utils)
|
|
||||||
(guix build utils))
|
|
||||||
#:imported-modules (,@%gnu-build-system-modules
|
|
||||||
(guix build qt-utils))
|
|
||||||
#:phases
|
|
||||||
(modify-phases %standard-phases
|
|
||||||
(add-after 'install 'wrap-qt
|
|
||||||
(lambda* (#:key outputs inputs #:allow-other-keys)
|
|
||||||
(let ((out (assoc-ref outputs "out")))
|
|
||||||
(wrap-qt-program "qbittorrent" #:output out #:inputs inputs))
|
|
||||||
#t)))))
|
|
||||||
(native-inputs
|
(native-inputs
|
||||||
(list pkg-config qttools-5))
|
(list qttools-5))
|
||||||
(inputs
|
(inputs
|
||||||
`(("boost" ,boost)
|
(list boost
|
||||||
("libtorrent-rasterbar" ,libtorrent-rasterbar)
|
libtorrent-rasterbar
|
||||||
("openssl" ,openssl)
|
openssl
|
||||||
("python" ,python-wrapper)
|
python-wrapper
|
||||||
("qtbase" ,qtbase-5)
|
qtsvg-5
|
||||||
("qtsvg-5" ,qtsvg-5)
|
zlib))
|
||||||
("zlib" ,zlib)))
|
|
||||||
(home-page "https://www.qbittorrent.org/")
|
(home-page "https://www.qbittorrent.org/")
|
||||||
(synopsis "Graphical BitTorrent client")
|
(synopsis "Graphical BitTorrent client")
|
||||||
(description
|
(description
|
||||||
|
@ -510,11 +494,7 @@ features.")
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments base)
|
(substitute-keyword-arguments (package-arguments base)
|
||||||
((#:configure-flags configure-flags)
|
((#:configure-flags configure-flags)
|
||||||
#~(append #$configure-flags
|
#~(cons "-DGUI=OFF" #$configure-flags))))
|
||||||
(list "--disable-gui")))
|
|
||||||
((#:phases phases)
|
|
||||||
#~(modify-phases #$phases
|
|
||||||
(delete 'wrap-qt)))))
|
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs (package-inputs base)
|
(modify-inputs (package-inputs base)
|
||||||
(delete "qtsvg-5"))))))
|
(delete "qtsvg-5"))))))
|
||||||
|
|
Reference in New Issue