ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-18 12:47:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: classpath-jamvm-wrappers: Use G-Expression.

Browse source 
* gnu/packages/java.scm (classpath-jamvm-wrappers)[arguments]: Use a gexp to
remove references to %build-inputs and %outputs.
[native-inputs]: Replace bash with bash-minimal; use label-less style.
This commit is contained in:
Ricardo Wurmus 2021-12-18 17:29:11 +01:00
parent de48029bb3
commit 380c52e901
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 31 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
gnu/packages/java.scm
View file

@ -622,20 +622,20 @@ (define classpath-jamvm-wrappers
(source #f)
(build-system trivial-build-system)
(arguments
`(#:modules ((guix build utils))
(list
#:modules '((guix build utils))
#:builder
(begin
#~(begin
(use-modules (guix build utils))
(let* ((bash (assoc-ref %build-inputs "bash"))
(jamvm (assoc-ref %build-inputs "jamvm"))
(classpath (assoc-ref %build-inputs "classpath"))
(bin (string-append (assoc-ref %outputs "out")
"/bin/")))
(let ((bash #$(this-package-native-input "bash-minimal"))
(jamvm #$(this-package-native-input "jamvm"))
(classpath #$(this-package-native-input "classpath"))
(bin (string-append #$output "/bin/")))
(mkdir-p bin)
(for-each (lambda (tool)
(with-output-to-file (string-append bin tool)
(lambda _
,@(if (string-prefix? "armhf" (or (%current-system)
#$@(if (string-prefix? "armhf" (or (%current-system)
(%current-target-system)))
`((format #t "#!~a/bin/sh
~a/bin/jamvm -Xnocompact -classpath ~a/share/classpath/tools.zip \
@ -655,12 +655,9 @@ (define classpath-jamvm-wrappers
"rmid"
"orbd"
"rmiregistry"
"native2ascii"))
#t))))
"native2ascii"))))))
(native-inputs
`(("bash" ,bash)
("jamvm" ,jamvm-1-bootstrap)
("classpath" ,classpath-0.99)))
(list bash-minimal jamvm-1-bootstrap classpath-0.99))
(inputs '())
(synopsis "Executables from GNU Classpath")
(description "This package provides wrappers around the tools provided by