openjdk: 14.0.2 -> 15.0.1
* update two explicit references to jdk14 to just jdk, which no longer points at jdk8 after #89731. * patch an explicit -XX:+UseConcMarkSweepGC to -XX:UseG1GC, as the former now throws an error (after having been deprecated since jdk 9)
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
, makeDesktopItem
|
||||
, fetchFromGitHub
|
||||
, gradleGen
|
||||
, jdk14
|
||||
, jdk
|
||||
, perl
|
||||
, jre
|
||||
, alsaLib
|
||||
@@ -51,7 +51,7 @@ let
|
||||
'';
|
||||
|
||||
# The default one still uses jdk8 (#89731)
|
||||
gradle_6 = (gradleGen.override (old: { java = jdk14; })).gradle_6_7;
|
||||
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_7;
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
|
||||
Reference in New Issue
Block a user