diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-04-28 16:24:46 +0200 |
| commit | 284fa7264963acc5d114ef5d54c347126b1654ba (patch) | |
| tree | 3e5360fcc81b6d0dce76a65aca60cf8528f2931f /gnu/packages/java.scm | |
| parent | 12c9da35389dfba86ae0d863132a6b2c4374205a (diff) | |
| parent | 882cacc1bb5be0df334dd7ce55b385a3a1678728 (diff) | |
| download | guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar guix-patches-284fa7264963acc5d114ef5d54c347126b1654ba.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/java.scm')
| -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 b27892841e..43422f383f 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2185,7 +2185,12 @@ new Date();")) (file-name (git-file-name name version)) (sha256 (base32 - "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i")))) + "168cr08nywp0q3vyj8njkhsmmnyd8rz9r58hk4xhzdzc6bdfkl1i")) + (patches + (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) + (inputs + (cons `("libxcursor" ,libxcursor) ; for our patch to work + (package-inputs openjdk14))) (native-inputs `(("autoconf" ,autoconf) ("openjdk14:jdk" ,openjdk14 "jdk") @@ -2208,7 +2213,9 @@ new Date();")) (file-name (git-file-name name version)) (sha256 (base32 - "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f")))) + "1ggddsbsar4dj2fycfqqqagqil7prhb30afvq6933rz7pa9apm2f")) + (patches + (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) (native-inputs `(("autoconf" ,autoconf) ("openjdk15:jdk" ,openjdk15 "jdk") @@ -2243,7 +2250,9 @@ new Date();")) (file-name (git-file-name name version)) (sha256 (base32 - "1l1jgbz8q7zq66npfg88r0l5xga427vrz35iys09j44b6qllrldd")))) + "1l1jgbz8q7zq66npfg88r0l5xga427vrz35iys09j44b6qllrldd")) + (patches + (search-patches "openjdk-15-xcursor-no-dynamic.patch")))) (native-inputs `(("autoconf" ,autoconf) ("openjdk16:jdk" ,openjdk16 "jdk") |