diff options
Diffstat (limited to 'gnu/packages/music.scm')
| -rw-r--r-- | gnu/packages/music.scm | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index b7dc7d9aaa..e399c0293d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -134,11 +134,13 @@ (sha256 (base32 "1cs3z6frx2ch7rm5ammx9p0rxcjrbj1vq14hvcbimpaw39rdsn3d")))) - (build-system gnu-build-system) + (build-system scons-build-system) (arguments `(#:tests? #f ;no tests + #:scons-flags + (list (string-append "prefix=" (assoc-ref %outputs "out"))) + #:scons ,scons-python2 #:phases - ;; TODO: Add scons-build-system and use it here. (modify-phases %standard-phases (delete 'configure) (add-after 'unpack 'scons-propagate-environment @@ -161,26 +163,18 @@ " or \"score/\" in file" " or \"Documentation/\" in file"))) #t)) - (replace 'build (lambda _ (zero? (system* "scons")))) - (replace 'install + (add-after 'install 'fix-directory-permissions (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (and - (zero? (system* "scons" - (string-append "prefix=" out) - "install")) - ;; Fix directory permissions - (begin - (chmod (string-append out "/share/Aria/Documentation") #o555) - (chmod (string-append out "/share/Aria/score") #o555) - #t)))))))) + (chmod (string-append out "/share/Aria/Documentation") #o555) + (chmod (string-append out "/share/Aria/score") #o555) + #t)))))) (inputs `(("wxwidgets" ,wxwidgets) ("glib" ,glib) ("alsa-lib" ,alsa-lib))) (native-inputs - `(("scons" ,scons) - ("pkg-config" ,pkg-config))) + `(("pkg-config" ,pkg-config))) (home-page "http://ariamaestosa.sourceforge.net/") (synopsis "MIDI sequencer and editor") (description @@ -1187,6 +1181,14 @@ add_library( rapidjson INTERFACE IMPORTED )")) "exclude:Score/ViewFilter/ViewFilter" "exclude:Formats/PowerTabOldImport/Directions" )))) + ;; FIXME: This bug has been fixed upstream, but no release has been + ;; made yet. See https://github.com/powertab/powertabeditor/issues/257 + (add-after 'unpack 'fix-boost-bug + (lambda _ + (substitute* "source/score/voiceutils.cpp" + (("boost::rational<int> duration\\(4, pos.getDurationType\\(\\)\\);") + "boost::rational<int> duration(4, static_cast<int>(pos.getDurationType()));")) + #t)) (add-before 'configure 'remove-third-party-libs (lambda* (#:key inputs #:allow-other-keys) ;; Link with required static libraries, because we're not |