gnu: tuxguitar: Update to 1.5.2.

* gnu/packages/music.scm (tuxguitar): Update to 1.5.2.
[source]: Remove obsolete snippet.
This commit is contained in:
Tobias Geerinckx-Rice 2018-08-24 02:02:38 +02:00
parent 38146797e6
commit a0a7e42500
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79

View file

@ -1624,7 +1624,7 @@ (define-public bristol
(define-public tuxguitar (define-public tuxguitar
(package (package
(name "tuxguitar") (name "tuxguitar")
(version "1.5") (version "1.5.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -1632,19 +1632,12 @@ (define-public tuxguitar
version "/tuxguitar-" version "-src.tar.gz")) version "/tuxguitar-" version "-src.tar.gz"))
(sha256 (sha256
(base32 (base32
"1yd5wv17sh6i8pkndxayfd6r2k1ccgnc4w3nda3lpniv8cpjzz3k")) "10arfpgm2pw7mn922klklzn05lw5ifqx070shdrar81afmkfbbd9"))))
(modules '((guix build utils)))
(snippet
'(begin
;; Delete pre-built classes
(delete-file-recursively "TuxGuitar-android-gdrive/bin")
(delete-file-recursively "TuxGuitar-android-gdrive-gdaa/bin")
#t))))
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:build-target "build" `(#:build-target "build"
#:jdk ,icedtea-8 #:jdk ,icedtea-8
#:tests? #f ; no tests #:tests? #f ; no tests
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'enter-dir (add-after 'unpack 'enter-dir
@ -1663,7 +1656,7 @@ (define-public tuxguitar
((assoc-ref %standard-phases 'build) ((assoc-ref %standard-phases 'build)
#:build-target "build") #:build-target "build")
(begin (begin
;; Generate default build.xml ;; Generate default build.xml.
((@@ (guix build ant-build-system) default-build.xml) ((@@ (guix build ant-build-system) default-build.xml)
(string-append (string-downcase dir) ".jar") (string-append (string-downcase dir) ".jar")
(string-append (assoc-ref outputs "out") (string-append (assoc-ref outputs "out")
@ -1686,15 +1679,15 @@ (define-public tuxguitar
(lib (string-append share "/java")) (lib (string-append share "/java"))
(swt (assoc-ref inputs "java-swt"))) (swt (assoc-ref inputs "java-swt")))
(mkdir-p bin) (mkdir-p bin)
;; install all jars ;; Install all jars.
(for-each (lambda (file) (for-each (lambda (file)
(install-file file lib)) (install-file file lib))
(find-files ".." "\\.jar$")) (find-files ".." "\\.jar$"))
;; install all resources ;; Install all resources.
(copy-recursively "share" share) (copy-recursively "share" share)
;; create wrapper ;; Create wrapper.
(call-with-output-file (string-append bin "/tuxguitar") (call-with-output-file (string-append bin "/tuxguitar")
(lambda (port) (lambda (port)
(let ((classpath (string-join (append (find-files lib "\\.jar$") (let ((classpath (string-join (append (find-files lib "\\.jar$")