diff options
| author | Doron Behar <doron.behar@gmail.com> | 2023-12-01 11:07:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-01 11:07:37 +0000 |
| commit | 1308c646c71e5d3ba65f515da2adb23d3f7d6aa1 (patch) | |
| tree | 2c6eb1716f2012ac49fe29ffb745d399bbd05334 /pkgs | |
| parent | 36de5e6c04ab8764c5eed7ecdb981e6e2756675b (diff) | |
| parent | 826ee3f67dcf0cec13b5f7b5ab4c9dfb7147ffc1 (diff) | |
Merge pull request #266110 from linsui/jsw
java-service-wrapper: build with latest jdk
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/system/java-service-wrapper/default.nix | 25 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 19 insertions, 10 deletions
diff --git a/pkgs/tools/system/java-service-wrapper/default.nix b/pkgs/tools/system/java-service-wrapper/default.nix index acc5ddf3f54e..332f58749654 100644 --- a/pkgs/tools/system/java-service-wrapper/default.nix +++ b/pkgs/tools/system/java-service-wrapper/default.nix @@ -1,6 +1,10 @@ -{ lib, stdenv, fetchurl +{ lib +, stdenv +, fetchurl , jdk -, ant, cunit, ncurses +, ant +, cunit +, ncurses }: stdenv.mkDerivation rec { @@ -12,18 +16,25 @@ stdenv.mkDerivation rec { hash = "sha256-t16i1WqvDqr4J5sDldeUk6+DAyN/6oWGV6eME5yj+i4="; }; - buildInputs = [ jdk ]; - nativeBuildInputs = [ ant cunit ncurses ]; + strictDeps = true; + + buildInputs = [ cunit ncurses ]; + + nativeBuildInputs = [ ant jdk ]; + + postConfigure = '' + substituteInPlace default.properties \ + --replace "javac.target.version=1.4" "javac.target.version=8" + ''; buildPhase = '' runHook preBuild - export ANT_HOME=${ant} - export JAVA_HOME=${jdk}/lib/openjdk/jre/ + export JAVA_HOME=${jdk}/lib/openjdk/ export JAVA_TOOL_OPTIONS=-Djava.home=$JAVA_HOME export CLASSPATH=${jdk}/lib/openjdk/lib/tools.jar - ${if stdenv.isi686 then "./build32.sh" else "./build64.sh"} + ant -f build.xml -Dbits=${if stdenv.isi686 then "32" else "64"} runHook postBuild ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 76e71cd88b7b..d55698f1362f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16497,9 +16497,7 @@ with pkgs; jasmin = callPackage ../development/compilers/jasmin { }; - java-service-wrapper = callPackage ../tools/system/java-service-wrapper { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + java-service-wrapper = callPackage ../tools/system/java-service-wrapper { }; jna = callPackage ../development/java-modules/jna { }; |