diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-21 12:52:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-05-01 17:12:24 +0200 |
| commit | 668384d160b58cd137072c34e66e65e1c11851d4 (patch) | |
| tree | adf0713ba91ea338c390d4b58b157d1787e48bc1 | |
| parent | 522a48a2280347442fcefdfd68444fd8d108fd6b (diff) | |
| download | guix-668384d160b58cd137072c34e66e65e1c11851d4.tar.gz guix-668384d160b58cd137072c34e66e65e1c11851d4.zip | |
gnu: openjdk: Avoid non-top-level 'use-modules'.
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11)[arguments]:
Replace non-top-level 'use-modules' by '@'.
| -rw-r--r-- | gnu/packages/java.scm | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index ae31f5ba42..3cd976685c 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")))) |