diff options
| author | Julien Lepiller <julien@lepiller.eu> | 2020-06-27 23:58:07 +0200 |
|---|---|---|
| committer | Julien Lepiller <julien@lepiller.eu> | 2020-07-17 04:21:13 +0200 |
| commit | b777e194376ec5ace990789e92251f89983da3e6 (patch) | |
| tree | 3516de8dbe960f9e36da7c7a4e7f0e0906ea45cc /gnu/packages/java.scm | |
| parent | e1ee5a75f3017315bb82f38b068bd4c003464b64 (diff) | |
| download | guix-b777e194376ec5ace990789e92251f89983da3e6.tar guix-b777e194376ec5ace990789e92251f89983da3e6.tar.gz | |
gnu: Add maven-surefire-common.
* gnu/packages/maven.scm (maven-surefire-common): New variable.
* gnu/packages/java.scm (java-hawtjni, java-jansi-native, java-jansi):
Install from pom file.
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index bc650968e0..f7d8c8c696 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -11079,7 +11079,11 @@ including pre-existing objects that you do not have source-code of.") (with-directory-excursion "hawtjni-generator/src/main/resources/" (install-file "libhawtjni.so" lib) (install-file "hawtjni.h" inc))) - #t))))) + #t)) + (add-before 'install 'install-parent + (install-pom-file "pom.xml")) + (replace 'install + (install-from-pom "hawtjni-runtime/pom.xml"))))) (inputs `(("java-commons-cli" ,java-commons-cli) ("java-asm" ,java-asm) @@ -11138,8 +11142,16 @@ that is part of the SWT Tools project.") (lambda* (#:key outputs #:allow-other-keys) (install-file "src/main/native-package/src/jansi.h" (string-append (assoc-ref outputs "out") "/include")) - #t))))) - (inputs + #t)) + (add-before 'install 'fix-pom + (lambda _ + ;; pom contains variables to complete name, but we don't support that + (substitute* "pom.xml" + (("\\$\\{platform\\}") "native")) + #t)) + (replace 'install + (install-from-pom "pom.xml"))))) + (propagated-inputs `(("java-hawtjni" ,java-hawtjni))) (home-page "https://fusesource.github.io/jansi/") (synopsis "Native library for jansi") @@ -11168,8 +11180,25 @@ console output.") (modify-phases %standard-phases (add-after 'check 'clear-term (lambda _ - (invoke "echo" "-e" "\\e[0m")))))) - (inputs + (invoke "echo" "-e" "\\e[0m"))) + (add-before 'install 'install-parent + (install-pom-file "pom.xml")) + (add-before 'install 'fix-pom + (lambda _ + ;; pom adds jansi native versions for different platforms, but we + ;; only need one, so use native instead + (substitute* "jansi/pom.xml" + (("windows32") "native") + (("windows64") "native") + (("osx") "native") + (("linux32") "native") + (("linux64") "native") + (("freebsd32") "native") + (("freebsd64") "native")) + #t)) + (replace 'install + (install-from-pom "jansi/pom.xml"))))) + (propagated-inputs `(("java-jansi-native" ,java-jansi-native))) (native-inputs `(("java-junit" ,java-junit) |