diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-04-21 12:52:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-04-21 14:33:28 +0200 |
| commit | e511a1d32745e3edf429a01b8864dc2f18adf83f (patch) | |
| tree | bbf0cd640ff1acaac7ae037027ba4d0fabadc6a1 /gnu | |
| parent | 698c4365baaad7eac7e5f38bd6527cf517200052 (diff) | |
| download | guix-e511a1d32745e3edf429a01b8864dc2f18adf83f.tar guix-e511a1d32745e3edf429a01b8864dc2f18adf83f.tar.gz | |
gnu: openjdk: Avoid non-top-level 'use-modules'.
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11)[arguments]:
Replace non-top-level 'use-modules' by '@'.
Diffstat (limited to 'gnu')
| -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 3c5a438492..f5e59b9775 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")))) |