@@ -1,7 +1,6 @@
1−{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
1+{ lib, stdenv, fetchFromGitHub, jdk11, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
22let
3− # The default one still uses jdk8 (#89731)
4− gradle = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
3+ gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_8;
54
65 pname = "scenebuilder";
76 version = "15.0.1";
@@ -17,7 +16,7 @@ let
1716 name = "${pname}-deps";
1817 inherit src;
1918
20− nativeBuildInputs = [ jdk perl gradle ];
19+ nativeBuildInputs = [ jdk11 perl gradle ];
2120
2221 buildPhase = ''
2322 export GRADLE_USER_HOME=$(mktemp -d);
@@ -77,7 +76,7 @@ let
7776in stdenv.mkDerivation rec {
7877 inherit pname src version;
7978
80− nativeBuildInputs = [ jdk gradle makeWrapper glib wrapGAppsHook ];
79+ nativeBuildInputs = [ jdk11 gradle makeWrapper glib wrapGAppsHook ];
8180
8281 dontWrapGApps = true; # prevent double wrapping
8382
@@ -101,7 +100,7 @@ in stdenv.mkDerivation rec {
101100 '';
102101
103102 postFixup = ''
104− makeWrapper ${jdk}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}"
103+ makeWrapper ${jdk11}/bin/java $out/bin/${pname} --add-flags "-jar $out/share/${pname}/${pname}.jar" "''${gappsWrapperArgs[@]}"
105104 '';
106105
107106 desktopItems = [ desktopItem ];