dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fastddsgen: upgrade to openjdk17

Browse Source 
This prevents build dependency on Python 2.7 (see #201859).

Upstream recommends using openjdk8 or 11, but my tests show that using
openjdk17 works well.
This commit is contained in:
Michal Sojka 2022-12-01 19:20:39 +01:00
parent 4c5c40f176
commit e35603d8b2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/fastddsgen/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk11, git, perl, cmake }: { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }:
let let
pname = "fastddsgen"; pname = "fastddsgen";
version = "2.2.0"; version = "2.2.0";
@ -15,7 +15,7 @@ let
deps = stdenv.mkDerivation { deps = stdenv.mkDerivation {
pname = "${pname}-deps"; pname = "${pname}-deps";
inherit src version; inherit src version;
nativeBuildInputs = [ gradle openjdk11 perl ]; nativeBuildInputs = [ gradle openjdk17 perl ];
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d); export GRADLE_USER_HOME=$(mktemp -d);
@ -39,7 +39,7 @@ in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit pname src version; inherit pname src version;
nativeBuildInputs = [ gradle openjdk11 ]; nativeBuildInputs = [ gradle openjdk17 ];
# use our offline deps # use our offline deps
postPatch = '' postPatch = ''
@ -72,7 +72,7 @@ stdenv.mkDerivation {
# Override the default start script to use absolute java path # Override the default start script to use absolute java path
cat <<EOF >$out/bin/fastddsgen cat <<EOF >$out/bin/fastddsgen
#!${runtimeShell} #!${runtimeShell}
exec ${openjdk11}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" exec ${openjdk17}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@"
EOF EOF
chmod a+x "$out/bin/fastddsgen" chmod a+x "$out/bin/fastddsgen"
@ -92,6 +92,6 @@ stdenv.mkDerivation {
used to publish or subscribe. used to publish or subscribe.
''; '';
maintainers = with maintainers; [ wentasah ]; maintainers = with maintainers; [ wentasah ];
platforms = openjdk11.meta.platforms; platforms = openjdk17.meta.platforms;
}; };
} }