diff options
| author | Charlotte Van Petegem <charlotte.vanpetegem@ugent.be> | 2023-05-17 14:16:55 +0200 |
|---|---|---|
| committer | Charlotte Van Petegem <charlotte.vanpetegem@ugent.be> | 2023-05-23 15:36:57 +0200 |
| commit | cf69135539e3388badf036dc30952a1f82bac2d5 (patch) | |
| tree | 71c52be3d088a70600babfb12d1516605d2a576c | |
| parent | 2b046918906f63555ec5e400e7d09f59163d2ba6 (diff) | |
| download | nixpkgs-cf69135539e3388badf036dc30952a1f82bac2d5.tar nixpkgs-cf69135539e3388badf036dc30952a1f82bac2d5.tar.gz nixpkgs-cf69135539e3388badf036dc30952a1f82bac2d5.tar.bz2 nixpkgs-cf69135539e3388badf036dc30952a1f82bac2d5.tar.lz nixpkgs-cf69135539e3388badf036dc30952a1f82bac2d5.tar.xz nixpkgs-cf69135539e3388badf036dc30952a1f82bac2d5.tar.zst nixpkgs-cf69135539e3388badf036dc30952a1f82bac2d5.zip | |
openjfx17: fix building with webkit
| -rw-r--r-- | pkgs/development/compilers/openjdk/openjfx/17.nix | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/compilers/openjdk/openjfx/17.nix b/pkgs/development/compilers/openjdk/openjfx/17.nix index febbff49537..a6300c38581 100644 --- a/pkgs/development/compilers/openjdk/openjfx/17.nix +++ b/pkgs/development/compilers/openjdk/openjfx/17.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, writeText, openjdk17_headless, gradle_7 , pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib -, ffmpeg_4-headless, python3, ruby, icu68 +, ffmpeg_4-headless, python3, ruby, icu71, fetchurl, runCommand , withMedia ? true , withWebKit ? false }: @@ -14,6 +14,18 @@ let java = openjdk17_headless; }); + dashed-icu-version = lib.concatStringsSep "-" (lib.splitString "." (lib.getVersion icu71)); + underscored-icu-version = lib.concatStringsSep "_" (lib.splitString "." (lib.getVersion icu71)); + icu-data = fetchurl { + url = "https://github.com/unicode-org/icu/releases/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip"; + hash = "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="; + }; + + fakeRepository = runCommand "icu-data-repository" {} '' + mkdir -p $out/download/release-${dashed-icu-version} + cp ${icu-data} $out/download/release-${dashed-icu-version}/icu4c-${underscored-icu-version}-data-bin-l.zip + ''; + makePackage = args: stdenv.mkDerivation ({ version = "${major}${update}${build}"; @@ -24,7 +36,7 @@ let sha256 = "sha256-9VfXk2EfMebMyVKPohPRP2QXRFf8XemUtfY0JtBCHyw="; }; - buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu68 ]; + buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_4-headless icu71 ]; nativeBuildInputs = [ gradle_ perl pkg-config cmake gperf python3 ruby ]; dontUseCmakeConfigure = true; @@ -71,6 +83,7 @@ in makePackage { gradleProperties = '' COMPILE_MEDIA = ${lib.boolToString withMedia} COMPILE_WEBKIT = ${lib.boolToString withWebKit} + ${lib.optionalString withWebKit "icuRepositoryURL = file://${fakeRepository}"} ''; preBuild = '' |