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

65
gnu/packages/java.scm
View file

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