diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-02-27 20:53:15 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-02-28 23:05:06 +0100 |
| commit | e85c1bf6cd72887eb20680ac8ebf578b5831e6f6 (patch) | |
| tree | e48dbcf06c98c3f5b35a3f2c2cf8050ff3d45218 /gnu/packages/java.scm | |
| parent | 3d6925ef51995cf4aab1c128cfcb6c322c0c5467 (diff) | |
| download | guix-patches-e85c1bf6cd72887eb20680ac8ebf578b5831e6f6.tar guix-patches-e85c1bf6cd72887eb20680ac8ebf578b5831e6f6.tar.gz | |
gnu: java-jansi-native: Simplify.
* gnu/packages/java.scm (java-jansi-native)[arguments]: Use "invoke"; remove
useless "mkdir-p".
Diffstat (limited to 'gnu/packages/java.scm')
| -rw-r--r-- | gnu/packages/java.scm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 1c84358301..3c208ffe64 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -8437,14 +8437,14 @@ that is part of the SWT Tools project.") (with-directory-excursion "src/main/native-package/src" (substitute* "jansi_ttyname.c" (("#include \"jansi_.*") "")) - (and - (system* "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o" - (string-append "-I" (assoc-ref inputs "java-hawtjni") - "/include") - (string-append "-I" (assoc-ref inputs "jdk") - "/include/linux") - "-fPIC" "-O2") - (system* "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o"))))) + (invoke "gcc" "-c" "jansi_ttyname.c" "-o" "jansi_ttyname.o" + (string-append "-I" (assoc-ref inputs "java-hawtjni") + "/include") + (string-append "-I" (assoc-ref inputs "jdk") + "/include/linux") + "-fPIC" "-O2") + (invoke "gcc" "-o" "libjansi.so" "-shared" "jansi_ttyname.o") + #t))) (add-before 'build 'install-native (lambda _ (let ((dir (string-append "build/classes/META-INF/native/" @@ -8457,7 +8457,6 @@ that is part of the SWT Tools project.") #t)) (add-after 'install 'install-native (lambda* (#:key outputs #:allow-other-keys) - (mkdir-p (string-append (assoc-ref outputs "out") "/include")) (install-file "src/main/native-package/src/jansi.h" (string-append (assoc-ref outputs "out") "/include")) #t))))) |