openjfx11: drop (#347149)
This commit is contained in:
Thiago Kenji Okada
@@ -122,5 +122,7 @@ stdenv.mkDerivation rec {
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ juaningan emmanuelrosa ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
# Requires OpenJFX 11 or 16, which are both EOL.
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,103 +0,0 @@
|
||||
{ stdenv, lib, pkgs, fetchFromGitHub, writeText, gradle_7, pkg-config, perl, cmake
|
||||
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg_7-headless, python3, ruby
|
||||
, openjdk11-bootstrap
|
||||
, withMedia ? true
|
||||
, withWebKit ? false
|
||||
}:
|
||||
|
||||
let
|
||||
pname = "openjfx-modular-sdk";
|
||||
major = "11";
|
||||
update = ".0.20";
|
||||
build = "1";
|
||||
repover = "${major}${update}+${build}";
|
||||
jdk = openjdk11-bootstrap;
|
||||
gradle = gradle_7;
|
||||
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
version = "${major}${update}-${build}";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "openjdk";
|
||||
repo = "jfx${major}u";
|
||||
rev = repover;
|
||||
sha256 = "sha256-BbBP2DiPZTSn1SBYMCgyiNdF9GD+NqR6YjeVNOQHHn4=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
../backport-ffmpeg-6-support-jfx11.patch
|
||||
../backport-ffmpeg-7-support-jfx11.patch
|
||||
];
|
||||
|
||||
buildInputs = [ gtk2 gtk3 libXtst libXxf86vm glib alsa-lib ffmpeg_7-headless ];
|
||||
nativeBuildInputs = [ gradle perl pkg-config cmake gperf python3 ruby ];
|
||||
|
||||
dontUseCmakeConfigure = true;
|
||||
|
||||
config = writeText "gradle.properties" ''
|
||||
CONF = Release
|
||||
JDK_HOME = ${jdk.home}
|
||||
COMPILE_MEDIA = ${lib.boolToString withMedia}
|
||||
COMPILE_WEBKIT = ${lib.boolToString withWebKit}
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace buildSrc/linux.gradle \
|
||||
--replace ', "-Werror=implicit-function-declaration"' ""
|
||||
|
||||
# Add missing includes for gcc-13 for webkit build:
|
||||
sed -e '1i #include <cstdio>' \
|
||||
-i modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/Heap.cpp \
|
||||
modules/javafx.web/src/main/native/Source/bmalloc/bmalloc/IsoSharedPageInlines.h
|
||||
|
||||
ln -s $config gradle.properties
|
||||
'';
|
||||
|
||||
mitmCache = gradle.fetchDeps {
|
||||
attrPath = "openjfx${major}";
|
||||
pkg = pkgs."openjfx${major}".override { withWebKit = true; };
|
||||
data = ./deps.json;
|
||||
};
|
||||
|
||||
__darwinAllowLocalNetworking = true;
|
||||
|
||||
preBuild = ''
|
||||
export NUMBER_OF_PROCESSORS=$NIX_BUILD_CORES
|
||||
export NIX_CFLAGS_COMPILE="$(pkg-config --cflags glib-2.0) $NIX_CFLAGS_COMPILE"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = false;
|
||||
|
||||
gradleBuildTask = "sdk";
|
||||
|
||||
installPhase = ''
|
||||
cp -r build/modular-sdk $out
|
||||
'';
|
||||
|
||||
stripDebugList = [ "." ];
|
||||
|
||||
postFixup = ''
|
||||
# Remove references to bootstrap.
|
||||
export openjdkOutPath='${jdk.outPath}'
|
||||
find "$out" -name \*.so | while read lib; do
|
||||
new_refs="$(patchelf --print-rpath "$lib" | perl -pe 's,:?\Q$ENV{openjdkOutPath}\E[^:]*,,')"
|
||||
patchelf --set-rpath "$new_refs" "$lib"
|
||||
done
|
||||
# Remove licenses, otherwise they may conflict with the ones included in the openjdk
|
||||
rm -rf $out/modules_legal/*
|
||||
'';
|
||||
|
||||
disallowedReferences = [ jdk gradle.jdk ];
|
||||
|
||||
# Uses a lot of RAM, OOMs otherwise
|
||||
requiredSystemFeatures = [ "big-parallel" ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "http://openjdk.java.net/projects/openjfx/";
|
||||
license = licenses.gpl2;
|
||||
description = "Next-generation Java client toolkit";
|
||||
maintainers = with maintainers; [ abbradar ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
};
|
||||
}
|
||||
-152
@@ -1,152 +0,0 @@
|
||||
{
|
||||
"!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
|
||||
"!version": 1,
|
||||
"https://download.eclipse.org": {
|
||||
"eclipse/updates/4.6/R-4.6.3-201703010400/plugins/org.eclipse.swt.gtk.linux.x86_64_3.105.3.v20170228-0512": {
|
||||
"jar": "sha256-qWM1HV97griQxJlOFY2AVV2uOLAK87jXPzh1wh/zmLw="
|
||||
}
|
||||
},
|
||||
"https://github.com": {
|
||||
"unicode-org/icu/releases/download/release-71-1/icu4c-71_1-data-bin-l": {
|
||||
"zip": "sha256-pVWIy0BkICsthA5mxhR9SJQHleMNnaEcGl/AaLi5qZM="
|
||||
}
|
||||
},
|
||||
"https://repo.maven.apache.org/maven2": {
|
||||
"com/ibm/icu#icu4j/61.1": {
|
||||
"jar": "sha256-VcmOsYOLKku5oH3Da9N4Uy1k0M3LfO7pFCNoZqfeRGQ=",
|
||||
"pom": "sha256-E7h6QHnOsFUVsZrHoVIDlHB1YB1JQj9xk1ikmACYBWs="
|
||||
},
|
||||
"junit#junit/4.13.2": {
|
||||
"jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
|
||||
"pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
|
||||
},
|
||||
"net/java#jvnet-parent/3": {
|
||||
"pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o="
|
||||
},
|
||||
"org/abego/treelayout#org.abego.treelayout.core/1.0.3": {
|
||||
"jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=",
|
||||
"pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw="
|
||||
},
|
||||
"org/antlr#ST4/4.1": {
|
||||
"jar": "sha256-ixzK7Z7cVc0lXZwZxNjaR1bZtvy0NWcSkrQ0cLFtddg=",
|
||||
"pom": "sha256-cz5r2XyjTMbfk6QkPlEeVnPLm4jHSxiETgQqRdUWmHw="
|
||||
},
|
||||
"org/antlr#antlr-master/3.5.2": {
|
||||
"pom": "sha256-QtkaUx6lEA6wm1QaoALDuQjo8oK9c7bi9S83HvEzG9Y="
|
||||
},
|
||||
"org/antlr#antlr-runtime/3.5.2": {
|
||||
"jar": "sha256-zj/I7LEPOemjzdy7LONQ0nLZzT0LHhjm/nPDuTichzQ=",
|
||||
"pom": "sha256-RqnCIAu4sSvXEkqnpQl/9JCZkIMpyFGgTLIFFCCqfyU="
|
||||
},
|
||||
"org/antlr#antlr4-master/4.7.2": {
|
||||
"pom": "sha256-upnLJdI5DzhoDHUChCoO4JWdHmQD4BPM/2mP1YVu6tE="
|
||||
},
|
||||
"org/antlr#antlr4-runtime/4.7.2": {
|
||||
"jar": "sha256-TFGLh9S9/4tEzYy8GvgW6US2Kj/luAt4FQHPH0dZu8Q=",
|
||||
"pom": "sha256-3AnLqYwl08BuSuxRaIXUw68DBiulX0/mKD/JzxdqYPs="
|
||||
},
|
||||
"org/antlr#antlr4/4.7.2": {
|
||||
"pom": "sha256-z56zaUD6xEiBA4wb4/LFjgbmjRq/v9SmjTS72LrFV3E="
|
||||
},
|
||||
"org/antlr#antlr4/4.7.2/complete": {
|
||||
"jar": "sha256-aFI4bXl17/KRcdrgAswiMlFRDTXyka4neUjzgaezgLQ="
|
||||
},
|
||||
"org/apache#apache/13": {
|
||||
"pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0="
|
||||
},
|
||||
"org/apache/lucene#lucene-core/7.1.0": {
|
||||
"jar": "sha256-vG3+7tCrp0MCqSCBH/1snkVlvviTzMOvg2Iz36s8UTo=",
|
||||
"pom": "sha256-d7ysnMSDKiKSGJgng2ASB8yYvldcyIRDNtWuBzkbPuE="
|
||||
},
|
||||
"org/apache/lucene#lucene-grouping/7.1.0": {
|
||||
"jar": "sha256-5wh/sGDRWa1xvW7p6W8BYGpaM1OgxJofHQ49oPUaTlo=",
|
||||
"pom": "sha256-738k/3YjlZSfxMiDl1npJhD8mx8Nifmbtw+haHNh2Ec="
|
||||
},
|
||||
"org/apache/lucene#lucene-parent/7.1.0": {
|
||||
"pom": "sha256-l7M9mcedTRIoIuWDY0cGvGmfRCvp3tksZiKdEn+WoAc="
|
||||
},
|
||||
"org/apache/lucene#lucene-queries/7.1.0": {
|
||||
"jar": "sha256-qamOR/ueclsDerV+wZts4QVBIoTLXl2aGs99Xv8TSTY=",
|
||||
"pom": "sha256-pvMWrRvMdKy3f3mP/AIKy9aD3nx5OUrFNgAdE6vktVY="
|
||||
},
|
||||
"org/apache/lucene#lucene-queryparser/7.1.0": {
|
||||
"jar": "sha256-HNuCsiqq3bGJW9OjSVinyaOgb/0NZ6sskNvDegRshlQ=",
|
||||
"pom": "sha256-K7m67AcL6g3a5aj1rrDOZlJpBeA4THS+18OrIJ52hdM="
|
||||
},
|
||||
"org/apache/lucene#lucene-sandbox/7.1.0": {
|
||||
"jar": "sha256-wZA9Xag+IIZp2NkzdJeeFAIUNYsq32c1sa488kkJW+E=",
|
||||
"pom": "sha256-WL5E6wSMD0If6eul+30xhr7gk7g72F4w5EKbbctVZMU="
|
||||
},
|
||||
"org/apache/lucene#lucene-solr-grandparent/7.1.0": {
|
||||
"pom": "sha256-3NW0Q/KK2QPk/wfTMigGxTF4BWuctNQU+2gMyArhGsU="
|
||||
},
|
||||
"org/apiguardian#apiguardian-api/1.1.2": {
|
||||
"jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
|
||||
"module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
|
||||
"pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
|
||||
},
|
||||
"org/glassfish#javax.json/1.0.4": {
|
||||
"jar": "sha256-Dh3sQKHt6WWUElHtqWiu7gUsxPUDeLwxbMSOgVm9vrQ=",
|
||||
"pom": "sha256-a6+Dg/+pi2bqls1b/B7H8teUY7uYrJgFKWSxIcIhLVQ="
|
||||
},
|
||||
"org/glassfish#json/1.0.4": {
|
||||
"pom": "sha256-bXxoQjEV+SFxjZRPhZkktMaFIX7AOkn3BFWossqpcuY="
|
||||
},
|
||||
"org/hamcrest#hamcrest-core/1.3": {
|
||||
"jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=",
|
||||
"pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM="
|
||||
},
|
||||
"org/hamcrest#hamcrest-parent/1.3": {
|
||||
"pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps="
|
||||
},
|
||||
"org/junit#junit-bom/5.8.1": {
|
||||
"module": "sha256-a4LLpSoTSxPBmC8M+WIsbUhTcdQLmJJG8xJOOwpbGFQ=",
|
||||
"pom": "sha256-733Ef45KFoZPR3lyjofteFOYGeT7iSdoqdprjvkD+GM="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter-api/5.8.1": {
|
||||
"jar": "sha256-zjN0p++6YF4tK2mj/vkBNAMrqz7MPthXmkhxscLEcpw=",
|
||||
"module": "sha256-DWnbwja33Kq0ynNpqlYOmwqbvvf5WIgv+0hTPLunwJ0=",
|
||||
"pom": "sha256-d61+1KYwutH8h0agpuZ1wj+2lAsnq2LMyzTk/Pz+Ob8="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter-engine/5.8.1": {
|
||||
"jar": "sha256-Rom8kCJVoZ/pgndoO6MjHAlNEHxUyNNfK2+cl9ImQY4=",
|
||||
"module": "sha256-aHkP7DP5ew7IQM9HrEDuDHLgVvEiyg88ZkZ0M0mTdpk=",
|
||||
"pom": "sha256-qjIKMYpyceMyYsSA/POZZbmobap2Zm63dTQrgOnN1F4="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter-params/5.8.1": {
|
||||
"jar": "sha256-OJuNE6jYhy/L1PDrp7LEavxihBn5obKjqfkyQaBqchg=",
|
||||
"module": "sha256-Ek1gPG2AMzZtjKRxY2tEbji5zBvQEPMpVCNYGHr6hl4=",
|
||||
"pom": "sha256-OrrKWfvfJTMg9yRCwQPjnOQDjcEf6MSJ28ScwjoHHws="
|
||||
},
|
||||
"org/junit/jupiter#junit-jupiter/5.8.1": {
|
||||
"jar": "sha256-jxBJ7iSzShC2DNgQBICZ94HCZYzeIYHoMUlqswqYKYU=",
|
||||
"module": "sha256-LjS6TIWMOM0KNlr//syTKnGWzpOF4utUBZQuWBwV/1w=",
|
||||
"pom": "sha256-rssFDSMtOT9Az/EfjMMPUrZslQpB+IOSXIEULt7l9PU="
|
||||
},
|
||||
"org/junit/platform#junit-platform-commons/1.8.1": {
|
||||
"jar": "sha256-+k+mjIvVTdDLScP8vpsuQvTaa+2+fnzPKgXxoeYJtZM=",
|
||||
"module": "sha256-aY/QVBrLfv/GZZhI/Qx91QEKSfFfDBy6Q+U1gH+Q9ms=",
|
||||
"pom": "sha256-4ZcoLlLnANEriJie3FSJh0aTUC5KqJB6zwgpgBq6bUQ="
|
||||
},
|
||||
"org/junit/platform#junit-platform-engine/1.8.1": {
|
||||
"jar": "sha256-cCho7X6GubRnLt4PHhhekFusqa+rV3RqfGUL48e8oEc=",
|
||||
"module": "sha256-2fQgpkU5o+32D4DfDG/XIrdQcldEx5ykD30lrlbKS6Q=",
|
||||
"pom": "sha256-hqrU5ld1TkOgDfIm3VTIrsHsarZTP1ASGQfkZi3i5fI="
|
||||
},
|
||||
"org/junit/vintage#junit-vintage-engine/5.8.1": {
|
||||
"jar": "sha256-F2tTzRvb+SM+lsiwx6nluGQoL7veukO1zq/e2ymkkVY=",
|
||||
"module": "sha256-nOn6Lk7mp0DWEBAlMEYqcc4PqdLxQYUi5LK9tgcvZ5o=",
|
||||
"pom": "sha256-Ndc3M08dvouMVnZ/oVCKwbVEsB1P5cmXl76QA+5YGxI="
|
||||
},
|
||||
"org/opentest4j#opentest4j/1.2.0": {
|
||||
"jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=",
|
||||
"pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/7": {
|
||||
"pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
|
||||
},
|
||||
"org/sonatype/oss#oss-parent/9": {
|
||||
"pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1177,6 +1177,7 @@ mapAliases {
|
||||
openjdk20_headless = openjdk20; # Added 2024-08-01
|
||||
jdk20 = openjdk20; # Added 2024-08-01
|
||||
jdk20_headless = openjdk20; # Added 2024-08-01
|
||||
openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07
|
||||
openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
|
||||
openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
|
||||
openjpeg_2 = openjpeg; # Added 2021-01-25
|
||||
|
||||
@@ -3299,9 +3299,7 @@ with pkgs;
|
||||
|
||||
bazarr = callPackage ../servers/bazarr { };
|
||||
|
||||
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop {
|
||||
openjdk11 = openjdk11.override { enableJavaFX = true; };
|
||||
};
|
||||
bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { };
|
||||
|
||||
bic = callPackage ../development/interpreters/bic { };
|
||||
|
||||
@@ -12374,9 +12372,7 @@ with pkgs;
|
||||
snort = callPackage ../applications/networking/ids/snort { };
|
||||
|
||||
soapui = callPackage ../applications/networking/soapui {
|
||||
jdk = if stdenv.hostPlatform.isDarwin
|
||||
then (jdk11.override { enableJavaFX = true; })
|
||||
else jdk11;
|
||||
jdk = jdk11;
|
||||
};
|
||||
|
||||
sockdump = callPackage ../tools/networking/sockdump { };
|
||||
@@ -15102,7 +15098,7 @@ with pkgs;
|
||||
|
||||
hugs = callPackage ../development/interpreters/hugs { };
|
||||
|
||||
inherit (javaPackages) openjfx11 openjfx17 openjfx21 openjfx22;
|
||||
inherit (javaPackages) openjfx17 openjfx21 openjfx22;
|
||||
openjfx = openjfx17;
|
||||
|
||||
openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
|
||||
|
||||
@@ -3,13 +3,12 @@
|
||||
with pkgs;
|
||||
|
||||
let
|
||||
openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11 { };
|
||||
openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17 { };
|
||||
openjfx21 = callPackage ../development/compilers/openjdk/openjfx/21 { };
|
||||
openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22 { };
|
||||
|
||||
in {
|
||||
inherit openjfx11 openjfx17 openjfx21 openjfx22;
|
||||
inherit openjfx17 openjfx21 openjfx22;
|
||||
|
||||
compiler = let
|
||||
mkOpenjdk = path-linux: path-darwin: args:
|
||||
@@ -44,7 +43,7 @@ in {
|
||||
openjdk11 = mkOpenjdk
|
||||
../development/compilers/openjdk/11.nix
|
||||
../development/compilers/zulu/11.nix
|
||||
{ openjfx = openjfx11; };
|
||||
{ openjfx = throw "JavaFX is not supported on OpenJDK 11"; };
|
||||
|
||||
openjdk17 = mkOpenjdk
|
||||
../development/compilers/openjdk/17.nix
|
||||
|
||||
Reference in New Issue
Block a user