diff options
Diffstat (limited to 'gnu/packages/music.scm')
| -rw-r--r-- | gnu/packages/music.scm | 66 |
1 files changed, 42 insertions, 24 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 99778024ba..bc34efeb9f 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -203,29 +203,31 @@ score, keyboard, guitar, drum and controller views.") "1hximk3q0p8nw8is5w7215xgkb7k4flnfyr0pdz9svfwvcm05w1i")) (modules '((guix build utils))) (snippet - '(for-each + '(begin + (for-each (lambda (dir) (delete-file-recursively - (string-append "3rdparty/" dir))) + (string-append "3rdparty/" dir))) (list - ;; TODO: The following dependencies are still bundled: - ;; - "qxt": Appears to be unmaintained upstream. - ;; - "qsqlite" - ;; - "qtsingleapplication" - ;; - "qocoa" - ;; - "qtiocompressor" - ;; - "gmock": The tests crash when using our googletest - ;; package instead of the bundled gmock. - "SPMediaKeyTap" - "fancytabwidget" - "google-breakpad" - "libmygpo-qt" - "libmygpo-qt5" - "libprojectm" - "qtwin" - "sha2" ;; Replaced by openssl. - "taglib" - "tinysvcmdns"))) + ;; TODO: The following dependencies are still bundled: + ;; - "qxt": Appears to be unmaintained upstream. + ;; - "qsqlite" + ;; - "qtsingleapplication" + ;; - "qocoa" + ;; - "qtiocompressor" + ;; - "gmock": The tests crash when using our googletest + ;; package instead of the bundled gmock. + "SPMediaKeyTap" + "fancytabwidget" + "google-breakpad" + "libmygpo-qt" + "libmygpo-qt5" + "libprojectm" + "qtwin" + "sha2" ;; Replaced by openssl. + "taglib" + "tinysvcmdns")) + #t)) (patches (search-patches "clementine-use-openssl.patch" "clementine-remove-crypto++-dependency.patch")))) (build-system cmake-build-system) @@ -1182,6 +1184,19 @@ add_library( rapidjson INTERFACE IMPORTED )")) (("boost::rational<int> duration\\(4, pos.getDurationType\\(\\)\\);") "boost::rational<int> duration(4, static_cast<int>(pos.getDurationType()));")) #t)) + ;; Fix build with Qt 5.11. + (add-after 'unpack 'add-missing-headers + (lambda _ + (substitute* (find-files "source/dialogs/" "\\.h$") + (("#include <QDialog>" m) + (string-append m "\n#include <QButtonGroup>"))) + (substitute* "source/widgets/mixer/mixeritem.h" + (("#include <QWidget>" m) + (string-append m "\n#include <QStyle>"))) + (substitute* "source/widgets/playback/playbackwidget.h" + (("#include <QWidget>" m) + (string-append m "\n#include <QButtonGroup>\n#include <QAction>"))) + #t)) (add-before 'configure 'remove-third-party-libs (lambda* (#:key inputs #:allow-other-keys) ;; Link with required static libraries, because we're not @@ -2630,7 +2645,8 @@ of tools for manipulating and accessing your music.") '(begin (delete-file-recursively "resources/music") (substitute* "CMakeLists.txt" - (("add_subdirectory\\(resources/music\\)") "")))))) + (("add_subdirectory\\(resources/music\\)") "")) + #t)))) (build-system cmake-build-system) (arguments '(#:tests? #f ; no check target @@ -2668,9 +2684,11 @@ for improved Amiga ProTracker 2/3 compatibility.") (modules '((guix build utils))) (snippet ;; Remove use of __DATE__ and __TIME__ for reproducibility. - `(substitute* "schism/version.c" - (("Schism Tracker built %s %s.*$") - (string-append "Schism Tracker version " ,version "\");")))))) + `(begin + (substitute* "schism/version.c" + (("Schism Tracker built %s %s.*$") + (string-append "Schism Tracker version " ,version "\");"))) + #t)))) (build-system gnu-build-system) (arguments `(#:phases |