Unverified Commit 5e288b6d authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

Merge pull request #333090 from panicgh/fastddsgen-wrapper 

fastddsgen: add missing C preprocessor dependency to wrapper
parents 2b68ffa8 1817b508

pkgs/development/tools/fastddsgen/default.nix

+19 −8
Original line number Diff line number Diff line 
{ lib, stdenv, runtimeShell, fetchFromGitHub, gradle_7, openjdk17 }:

{ lib

, stdenv

, makeWrapper

, fetchFromGitHub

, gradle_7

, openjdk17

}:



let

  pname = "fastddsgen";

  version = "3.3.0";
@@ -17,7 +24,11 @@ stdenv.mkDerivation { 
    hash = "sha256-oqbSIzsYUwD8bTqGKZ9he9d18EDq9mHZFoNUp0RK0qU=";

  };



  nativeBuildInputs = [ gradle openjdk17 ];

  nativeBuildInputs = [

    gradle

    openjdk17

    makeWrapper

  ];



  mitmCache = gradle.fetchDeps {

    inherit pname;
@@ -33,12 +44,12 @@ stdenv.mkDerivation { 


    gradle install --install_path=$out



    # Override the default start script to use absolute java path

    cat  <<EOF >$out/bin/fastddsgen

    #!${runtimeShell}

    exec ${openjdk17}/bin/java -jar "$out/share/fastddsgen/java/fastddsgen.jar" "\$@"

    EOF

    chmod a+x "$out/bin/fastddsgen"

    # Override the default start script to use absolute java path.

    # Make the unwrapped "cpp" available in the path, since the wrapped "cpp"

    # passes additional flags and produces output incompatible with fastddsgen.

    makeWrapper ${openjdk17}/bin/java $out/bin/fastddsgen \

      --add-flags "-jar $out/share/fastddsgen/java/fastddsgen.jar" \

      --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc ]}



    runHook postInstall

  '';