me
/
guix
Archived
1
0
Fork 0

gnu: icu4j: Fix build.

* gnu/packages/icu4c.scm (icu4j)[arguments]: Use gexp for 'make-flags'.
master
Guillaume Le Vaillant 2021-09-18 12:17:01 +02:00
parent 68557cd2f3
commit 048934c3b6
No known key found for this signature in database
GPG Key ID: 6BE8208ADF21FE3F
1 changed files with 15 additions and 12 deletions

View File

@ -8,6 +8,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de> ;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -29,6 +30,7 @@
#:use-module (gnu packages java) #:use-module (gnu packages java)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (guix gexp)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix utils) #:use-module (guix utils)
@ -164,18 +166,19 @@ C/C++ part.")
(build-system ant-build-system) (build-system ant-build-system)
(arguments (arguments
`(#:make-flags `(#:make-flags
(list (string-append "-Djunit.core.jar=" ,#~(list
(car (find-files (string-append "-Djunit.core.jar="
(assoc-ref %build-inputs "java-junit") (car (find-files
".*.jar$"))) #$(this-package-native-input "java-junit")
(string-append "-Djunit.junitparams.jar=" ".*.jar$")))
(car (find-files (string-append "-Djunit.junitparams.jar="
(assoc-ref %build-inputs "java-junitparams") (car (find-files
".*.jar$"))) #$(this-package-native-input "java-junitparams")
(string-append "-Djunit.hamcrest.jar=" ".*.jar$")))
(car (find-files (string-append "-Djunit.hamcrest.jar="
(assoc-ref %build-inputs "java-hamcrest-core") (car (find-files
".*.jar$")))) #$(this-package-native-input "java-hamcrest-core")
".*.jar$"))))
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'chdir (add-before 'configure 'chdir