From 2118d79dcf91a54cf30073bb801bdc818acd07ec Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Fri, 24 Oct 2025 11:42:44 +0200 Subject: [PATCH] gnu: hydrogen: Use Qt 6. * gnu/packages/music.scm (hydrogen)[arguments]: Build with Qt 6. [native-inputs]: Use qttools instead of qttools-5. [inputs]: Use qtbase, qtsvg and qtwayland instead of qtbase-5, qtsvg-5 and qtwayland-5. Remove qtxmlpattern-5. Change-Id: Ic1b2239ec74a9ffa3305afdf350576fed961d365 --- gnu/packages/music.scm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 2b9c2fad6c9..2e347767316 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1046,19 +1046,20 @@ settings (aliasing, linear interpolation and cubic interpolation).") (base32 "0fwyabkvrh1q30sqyhylly0c28cryq39lnqzgsv69jqvcc001bi4")))) (build-system qt-build-system) (arguments - `(#:tests? #f ; require audio subsystem - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-data-directory - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "CMakeLists.txt" - (("/usr/share/pixmaps") - (string-append (assoc-ref outputs "out") - "/share/pixmaps")))))))) + (list + #:tests? #f ; require audio subsystem + #:configure-flags #~(list "-DWANT_QT6=ON") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-data-directory + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + (("/usr/share/pixmaps") + (string-append #$output "/share/pixmaps")))))))) (native-inputs (list cppunit pkg-config - qttools-5)) + qttools)) (inputs (list alsa-lib jack-1 @@ -1068,10 +1069,9 @@ settings (aliasing, linear interpolation and cubic interpolation).") libsndfile lrdf pulseaudio - qtbase-5 - qtsvg-5 - qtxmlpatterns-5 - qtwayland-5 + qtbase + qtsvg + qtwayland zlib)) (home-page "http://hydrogen-music.org/") (synopsis "Drum machine")