[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch core-updates-frozen updated: gnu: icu4j: Fix build.
From: |
guix-commits |
Subject: |
branch core-updates-frozen updated: gnu: icu4j: Fix build. |
Date: |
Sat, 18 Sep 2021 06:20:06 -0400 |
This is an automated email from the git hooks/post-receive script.
glv pushed a commit to branch core-updates-frozen
in repository guix.
The following commit(s) were added to refs/heads/core-updates-frozen by this
push:
new 048934c gnu: icu4j: Fix build.
048934c is described below
commit 048934c3b6afec494e3258f0a57a3031072022b2
Author: Guillaume Le Vaillant <glv@posteo.net>
AuthorDate: Sat Sep 18 12:17:01 2021 +0200
gnu: icu4j: Fix build.
* gnu/packages/icu4c.scm (icu4j)[arguments]: Use gexp for 'make-flags'.
---
gnu/packages/icu4c.scm | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/icu4c.scm b/gnu/packages/icu4c.scm
index 0d5f34a..b9671a6 100644
--- a/gnu/packages/icu4c.scm
+++ b/gnu/packages/icu4c.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;; Copyright © 2020 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -29,6 +30,7 @@
#:use-module (gnu packages java)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
+ #:use-module (guix gexp)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix utils)
@@ -164,18 +166,19 @@ C/C++ part.")
(build-system ant-build-system)
(arguments
`(#:make-flags
- (list (string-append "-Djunit.core.jar="
- (car (find-files
- (assoc-ref %build-inputs "java-junit")
- ".*.jar$")))
- (string-append "-Djunit.junitparams.jar="
- (car (find-files
- (assoc-ref %build-inputs "java-junitparams")
- ".*.jar$")))
- (string-append "-Djunit.hamcrest.jar="
- (car (find-files
- (assoc-ref %build-inputs
"java-hamcrest-core")
- ".*.jar$"))))
+ ,#~(list
+ (string-append "-Djunit.core.jar="
+ (car (find-files
+ #$(this-package-native-input "java-junit")
+ ".*.jar$")))
+ (string-append "-Djunit.junitparams.jar="
+ (car (find-files
+ #$(this-package-native-input
"java-junitparams")
+ ".*.jar$")))
+ (string-append "-Djunit.hamcrest.jar="
+ (car (find-files
+ #$(this-package-native-input
"java-hamcrest-core")
+ ".*.jar$"))))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'chdir
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch core-updates-frozen updated: gnu: icu4j: Fix build.,
guix-commits <=