From a0a7e425005f6204a3c209884854955f6e0c67c6 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 24 Aug 2018 02:02:38 +0200 Subject: gnu: tuxguitar: Update to 1.5.2. * gnu/packages/music.scm (tuxguitar): Update to 1.5.2. [source]: Remove obsolete snippet. --- gnu/packages/music.scm | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index aed61085b5..af2dcf8eaf 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -1624,7 +1624,7 @@ (define-public bristol (define-public tuxguitar (package (name "tuxguitar") - (version "1.5") + (version "1.5.2") (source (origin (method url-fetch) (uri (string-append @@ -1632,19 +1632,12 @@ (define-public tuxguitar version "/tuxguitar-" version "-src.tar.gz")) (sha256 (base32 - "1yd5wv17sh6i8pkndxayfd6r2k1ccgnc4w3nda3lpniv8cpjzz3k")) - (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)))) + "10arfpgm2pw7mn922klklzn05lw5ifqx070shdrar81afmkfbbd9")))) (build-system ant-build-system) (arguments `(#:build-target "build" #:jdk ,icedtea-8 - #:tests? #f ; no tests + #:tests? #f ; no tests #:phases (modify-phases %standard-phases (add-after 'unpack 'enter-dir @@ -1663,7 +1656,7 @@ (define-public tuxguitar ((assoc-ref %standard-phases 'build) #:build-target "build") (begin - ;; Generate default build.xml + ;; Generate default build.xml. ((@@ (guix build ant-build-system) default-build.xml) (string-append (string-downcase dir) ".jar") (string-append (assoc-ref outputs "out") @@ -1686,15 +1679,15 @@ (define-public tuxguitar (lib (string-append share "/java")) (swt (assoc-ref inputs "java-swt"))) (mkdir-p bin) - ;; install all jars + ;; Install all jars. (for-each (lambda (file) (install-file file lib)) (find-files ".." "\\.jar$")) - ;; install all resources + ;; Install all resources. (copy-recursively "share" share) - ;; create wrapper + ;; Create wrapper. (call-with-output-file (string-append bin "/tuxguitar") (lambda (port) (let ((classpath (string-join (append (find-files lib "\\.jar$") -- cgit v1.2.3