diff options
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/11.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/15.nix | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index e751e9fc27325..e977d2b002035 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake +{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake , gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby , openjdk11-bootstrap }: @@ -7,9 +7,9 @@ let update = ".0.3"; build = "1"; repover = "${major}${update}+${build}"; - gradle_ = (gradleGen.override { + gradle_ = (gradle_4.override { java = openjdk11-bootstrap; - }).gradle_4_10; + }); makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; diff --git a/pkgs/development/compilers/openjdk/openjfx/15.nix b/pkgs/development/compilers/openjdk/openjfx/15.nix index c36cbaa03f957..26c16895c5d4e 100644 --- a/pkgs/development/compilers/openjdk/openjfx/15.nix +++ b/pkgs/development/compilers/openjdk/openjfx/15.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen +{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib , ffmpeg, python3, ruby }: @@ -7,9 +7,9 @@ let update = ".0.1"; build = "+1"; repover = "${major}${update}${build}"; - gradle_ = (gradleGen.override { + gradle_ = (gradle_5.override { java = openjdk11_headless; - }).gradle_5_6; + }); makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; |