diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2022-12-08 19:35:02 +0000 |
|---|---|---|
| committer | Thiago Kenji Okada <thiagokokada@gmail.com> | 2022-12-13 10:14:37 +0000 |
| commit | 9e5e9c57bb8958004134806eef8e31aed9375ea6 (patch) | |
| tree | 51158073089488b78a5db081b64ff3f486d3ec55 | |
| parent | 951304c4598f293b1028c76f2d30d66d1a595246 (diff) | |
| download | nixpkgs-9e5e9c57bb8958004134806eef8e31aed9375ea6.tar nixpkgs-9e5e9c57bb8958004134806eef8e31aed9375ea6.tar.gz nixpkgs-9e5e9c57bb8958004134806eef8e31aed9375ea6.tar.bz2 nixpkgs-9e5e9c57bb8958004134806eef8e31aed9375ea6.tar.lz nixpkgs-9e5e9c57bb8958004134806eef8e31aed9375ea6.tar.xz nixpkgs-9e5e9c57bb8958004134806eef8e31aed9375ea6.tar.zst nixpkgs-9e5e9c57bb8958004134806eef8e31aed9375ea6.zip | |
openjfx11: 11.0.11+1 -> 11.0.17+1
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/11.nix | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/11.nix b/pkgs/development/compilers/openjdk/openjfx/11.nix index 1bbb4e42dbc..164677c3b8d 100644 --- a/pkgs/development/compilers/openjdk/openjfx/11.nix +++ b/pkgs/development/compilers/openjdk/openjfx/11.nix @@ -1,13 +1,13 @@ -{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake -, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby +{ stdenv, lib, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake +, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_4-headless, python3, ruby, icu68 , openjdk11-bootstrap }: let major = "11"; - update = ".0.11"; + update = ".0.17"; build = "1"; repover = "${major}${update}+${build}"; - gradle_ = (gradle_4.override { + gradle_ = (gradle_7.override { java = openjdk11-bootstrap; }); @@ -24,12 +24,14 @@ let makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}-${build}"; - src = fetchurl { - url = "https://hg.openjdk.java.net/openjfx/${major}-dev/rt/archive/${repover}.tar.gz"; - sha256 = "sha256-mbEALUxuwbtlGeZ2Xsm3m3aNDdthLYWd6QHmdkAILxc="; + src = fetchFromGitHub { + owner = "openjdk"; + repo = "jfx${major}u"; + rev = repover; + sha256 = "sha256-uKb6k+tIFdwy1BYiHWeGmKNz82X4CZjFlGYqLDpSFY0="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -44,8 +46,6 @@ let JDK_HOME = ${openjdk11-bootstrap.home} '' + args.gradleProperties or ""); - inherit NIX_CFLAGS_COMPILE; - buildPhase = '' runHook preBuild @@ -74,10 +74,7 @@ let outputHashAlgo = "sha256"; outputHashMode = "recursive"; - # Downloaded AWT jars differ by platform. - outputHash = { - x86_64-linux = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa8="; - }.${stdenv.system} or (throw "Unsupported platform"); + outputHash = "sha256-syceJMUEknBDCHK8eGs6rUU3IQn+HnQfURfCrDxYPa9="; }; in makePackage { @@ -85,7 +82,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = true - COMPILE_WEBKIT = true + COMPILE_WEBKIT = false ''; preBuild = '' @@ -99,8 +96,6 @@ in makePackage { cp -r build/modular-sdk $out ''; - inherit NIX_CFLAGS_COMPILE; - stripDebugList = [ "." ]; postFixup = '' |