Merge pull request #203981 from wentasah/fastddsgen-openjdk17

authored by Sandro and committed by GitHub cd71c681 f76c121f

+5 -5
+5 -5
pkgs/development/tools/fastddsgen/default.nix
··· 1 - { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk11, git, perl, cmake }: 2 let 3 pname = "fastddsgen"; 4 version = "2.2.0"; ··· 15 deps = stdenv.mkDerivation { 16 pname = "${pname}-deps"; 17 inherit src version; 18 - nativeBuildInputs = [ gradle openjdk11 perl ]; 19 20 buildPhase = '' 21 export GRADLE_USER_HOME=$(mktemp -d); ··· 39 stdenv.mkDerivation { 40 inherit pname src version; 41 42 - nativeBuildInputs = [ gradle openjdk11 ]; 43 44 # use our offline deps 45 postPatch = '' ··· 72 # Override the default start script to use absolute java path 73 cat <<EOF >$out/bin/fastddsgen 74 #!${runtimeShell} 75 - exec ${openjdk11}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" 76 EOF 77 chmod a+x "$out/bin/fastddsgen" 78 ··· 92 used to publish or subscribe. 93 ''; 94 maintainers = with maintainers; [ wentasah ]; 95 - platforms = openjdk11.meta.platforms; 96 }; 97 }
··· 1 + { lib, stdenv, runtimeShell, writeText, fetchFromGitHub, gradle, openjdk17, git, perl, cmake }: 2 let 3 pname = "fastddsgen"; 4 version = "2.2.0"; ··· 15 deps = stdenv.mkDerivation { 16 pname = "${pname}-deps"; 17 inherit src version; 18 + nativeBuildInputs = [ gradle openjdk17 perl ]; 19 20 buildPhase = '' 21 export GRADLE_USER_HOME=$(mktemp -d); ··· 39 stdenv.mkDerivation { 40 inherit pname src version; 41 42 + nativeBuildInputs = [ gradle openjdk17 ]; 43 44 # use our offline deps 45 postPatch = '' ··· 72 # Override the default start script to use absolute java path 73 cat <<EOF >$out/bin/fastddsgen 74 #!${runtimeShell} 75 + exec ${openjdk17}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@" 76 EOF 77 chmod a+x "$out/bin/fastddsgen" 78 ··· 92 used to publish or subscribe. 93 ''; 94 maintainers = with maintainers; [ wentasah ]; 95 + platforms = openjdk17.meta.platforms; 96 }; 97 }