civodul pushed a commit to branch version-1.3.0
in repository guix.
commit 668384d160b58cd137072c34e66e65e1c11851d4
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Apr 21 12:52:21 2021 +0200
gnu: openjdk: Avoid non-top-level 'use-modules'.
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11)[arguments]:
Replace non-top-level 'use-modules' by '@'.
---
gnu/packages/java.scm | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index ae31f5b..3cd9766 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1792,10 +1792,13 @@ new Date();"))
(add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries.
(lambda _
- (use-modules (srfi srfi-1))
+ (define remove
+ (@ (srfi srfi-1) remove))
+
(define (icedtea-or-openjdk? path)
(or (string-contains path "openjdk")
(string-contains path "icedtea")))
+
(let* ((library-path (remove icedtea-or-openjdk?
(search-path-as-string->list
(getenv "LIBRARY_PATH"))))
@@ -1937,10 +1940,13 @@ new Date();"))
(add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries.
(lambda _
- (use-modules (srfi srfi-1))
+ (define remove
+ (@ (srfi srfi-1) remove))
+
(define (icedtea-or-openjdk? path)
(or (string-contains path "openjdk")
(string-contains path "icedtea")))
+
(let* ((library-path (remove icedtea-or-openjdk?
(search-path-as-string->list
(getenv "LIBRARY_PATH"))))
@@ -2151,10 +2157,13 @@ new Date();"))
(add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries.
(lambda _
- (use-modules (srfi srfi-1))
+ (define remove
+ (@ (srfi srfi-1) remove))
+
(define (icedtea-or-openjdk? path)
(or (string-contains path "openjdk")
(string-contains path "icedtea")))
+
(let* ((library-path (remove icedtea-or-openjdk?
(search-path-as-string->list
(getenv "LIBRARY_PATH"))))
