ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 13:58:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: openjdk: Avoid non-top-level 'use-modules'.

Browse source 
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk11)[arguments]:
Replace non-top-level 'use-modules' by '@'.
This commit is contained in:
Ludovic Courtès 2021-04-21 12:52:21 +02:00
parent 522a48a228
commit 668384d160
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/java.scm
View file

@ -1792,10 +1792,13 @@ (define-public icedtea-8
(add-after 'unpack 'patch-jni-libs (add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries. ;; Hardcode dynamically loaded libraries.
(lambda _ (lambda _
(use-modules (srfi srfi-1)) (define remove
(@ (srfi srfi-1) remove))
(define (icedtea-or-openjdk? path) (define (icedtea-or-openjdk? path)
(or (string-contains path "openjdk") (or (string-contains path "openjdk")
(string-contains path "icedtea"))) (string-contains path "icedtea")))
(let* ((library-path (remove icedtea-or-openjdk? (let* ((library-path (remove icedtea-or-openjdk?
(search-path-as-string->list (search-path-as-string->list
(getenv "LIBRARY_PATH")))) (getenv "LIBRARY_PATH"))))
@ -1937,10 +1940,13 @@ (define-public openjdk9
(add-after 'unpack 'patch-jni-libs (add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries. ;; Hardcode dynamically loaded libraries.
(lambda _ (lambda _
(use-modules (srfi srfi-1)) (define remove
(@ (srfi srfi-1) remove))
(define (icedtea-or-openjdk? path) (define (icedtea-or-openjdk? path)
(or (string-contains path "openjdk") (or (string-contains path "openjdk")
(string-contains path "icedtea"))) (string-contains path "icedtea")))
(let* ((library-path (remove icedtea-or-openjdk? (let* ((library-path (remove icedtea-or-openjdk?
(search-path-as-string->list (search-path-as-string->list
(getenv "LIBRARY_PATH")))) (getenv "LIBRARY_PATH"))))
@ -2151,10 +2157,13 @@ (define-public openjdk11
(add-after 'unpack 'patch-jni-libs (add-after 'unpack 'patch-jni-libs
;; Hardcode dynamically loaded libraries. ;; Hardcode dynamically loaded libraries.
(lambda _ (lambda _
(use-modules (srfi srfi-1)) (define remove
(@ (srfi srfi-1) remove))
(define (icedtea-or-openjdk? path) (define (icedtea-or-openjdk? path)
(or (string-contains path "openjdk") (or (string-contains path "openjdk")
(string-contains path "icedtea"))) (string-contains path "icedtea")))
(let* ((library-path (remove icedtea-or-openjdk? (let* ((library-path (remove icedtea-or-openjdk?
(search-path-as-string->list (search-path-as-string->list
(getenv "LIBRARY_PATH")))) (getenv "LIBRARY_PATH"))))