summaryrefslogtreecommitdiff
path: root/gnu/packages/music.scm
diff options
context:
space:
mode:
authorHartmut Goebel <h.goebel@crazy-compilers.com>2016-04-16 10:51:23 +0200
committerRicardo Wurmus <ricardo.wurmus@mdc-berlin.de>2016-04-19 16:55:03 +0200
commit1ad15c1669df7dad5bc234fb4f572e341bc04561 (patch)
tree07f97a7ba7c85414b20fa8e01c50eb0414589e29 /gnu/packages/music.scm
parente1c963bf0d31a4b9813844ebdcd10c9213022bd0 (diff)
downloadguix-patches-1ad15c1669df7dad5bc234fb4f572e341bc04561.tar
guix-patches-1ad15c1669df7dad5bc234fb4f572e341bc04561.tar.gz
gnu: Rename Java packages to match new naming specification.
* gnu/packages/bioinformatics.scm (htsjdk): Rename to... (java-htsjdk): ...this. (ngs-java): Rename to... (java-ngs): ...this. (ncbi-vdb)[arguments,inputs]: Use new name. * gnu/packages/java.scm (swt): Rename to... (java-swt): ...this. * gnu/packages/music.scm (tuxguitar)[make-flags,inputs,arguments]: Use new name of package "swt".
Diffstat (limited to 'gnu/packages/music.scm')
-rw-r--r--gnu/packages/music.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 280f3840bb..8f971f3614 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -775,7 +775,7 @@ is subjective.")
(string-append "PREFIX="
(assoc-ref %outputs "out"))
(string-append "SWT_PATH="
- (assoc-ref %build-inputs "swt")
+ (assoc-ref %build-inputs "java-swt")
"/share/java/swt.jar"))
#:tests? #f ;no "check" target
#:parallel-build? #f ;not supported
@@ -790,11 +790,11 @@ is subjective.")
(string-append "GCJFLAGS=-fsource=1.4 -fPIC " rest))
(("PROPERTIES\\?=")
(string-append "PROPERTIES?= -Dswt.library.path="
- (assoc-ref inputs "swt") "/lib"))
+ (assoc-ref inputs "java-swt") "/lib"))
(("\\$\\(GCJ\\) -o") "$(GCJ) $(LDFLAGS) -o"))
#t)))))
(inputs
- `(("swt" ,swt)))
+ `(("java-swt" ,java-swt)))
(native-inputs
`(("gcj" ,gcj)
("pkg-config" ,pkg-config)))