diff options
| author | Marius Bakke <marius@gnu.org> | 2021-05-17 17:46:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-05-22 17:08:12 +0200 |
| commit | b12a916e356ed5b7448d88dfcbf0bc689aa98ca4 (patch) | |
| tree | 76c4538e1df109d48a948521471eea4e0db27147 /gnu/packages | |
| parent | 0fb80f349d1fa683e6016edb541f7204aee2120f (diff) | |
| download | guix-b12a916e356ed5b7448d88dfcbf0bc689aa98ca4.tar.gz | |
gnu: java.scm: Adjust to new #:disallowed-references convention.
* gnu/packages/java.scm (icedtea-8, openjdk9, openjdk10, openjdk11)[arguments]: Adjust #:disallowed-references.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/java.scm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index a167aafc38..5dcee9e6ac 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -41,6 +41,7 @@ #:use-module (guix svn-download) #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (guix build-system ant) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) @@ -1752,7 +1753,7 @@ IcedTea build harness.") (guix build syscalls) ,@%gnu-build-system-modules) - #:disallowed-references ((,icedtea-7 "jdk")) + #:disallowed-references ,(list (gexp-input icedtea-7 "jdk")) ,@(substitute-keyword-arguments (package-arguments icedtea-7) ((#:modules modules) @@ -1908,7 +1909,8 @@ new Date();")) ((guix build syscalls) ,@%gnu-build-system-modules) - #:disallowed-references (,icedtea-8 (,icedtea-8 "jdk")) + #:disallowed-references ,(list (gexp-input icedtea-8) + (gexp-input icedtea-8 "jdk")) #:phases (modify-phases %standard-phases @@ -2107,7 +2109,8 @@ new Date();")) (string-append "--prefix=" (assoc-ref outputs "out"))) #t)))) ((#:disallowed-references _ '()) - `(,openjdk9 (,openjdk9 "jdk"))))) + `(,(gexp-input openjdk9) + ,(gexp-input openjdk9 "jdk"))))) (native-inputs `(("openjdk9" ,openjdk9) ("openjdk9:jdk" ,openjdk9 "jdk") @@ -2138,7 +2141,8 @@ new Date();")) `(#:imported-modules ((guix build syscalls) ,@%gnu-build-system-modules) - #:disallowed-references (,openjdk10 (,openjdk10 "jdk")) + #:disallowed-references ,(list (gexp-input openjdk10) + (gexp-input openjdk10 "jdk")) #:tests? #f; requires jtreg ;; TODO package jtreg |