Unverified Commit ac3dd910 authored by Arne Keller's avatar Arne Keller Committed by GitHub
Browse files

gradle: add udev to the JNA library path (#358670)

parents b6a35ab9 a81011bc

pkgs/development/tools/build-managers/gradle/default.nix

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ rec { 
    , unzip

    , ncurses5

    , ncurses6

    , udev

    , testers

    , runCommand

    , writeText
@@ -91,6 +92,7 @@ rec { 
          };

          varDefs = concatStringsSep "\n" (map (x: "  --set ${x} \\")

            ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs));

          jnaLibraryPath = lib.makeLibraryPath [ udev ];

        in ''

          mkdir -pv $out/lib/gradle/

          cp -rv lib/ $out/lib/gradle/
@@ -99,6 +101,7 @@ rec { 
          test -f $gradle_launcher_jar

          makeWrapper ${java}/bin/java $out/bin/gradle \

            ${varDefs}

            --add-flags "-Djna.library.path=${jnaLibraryPath}" \

            --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}"

        '';
@@ -129,6 +132,7 @@ rec { 
        # Gradle will refuse to start without _both_ 5 and 6 versions of ncurses.

        echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies

        echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies

        echo ${udev} >> $out/nix-support/manual-runtime-dependencies

      '';



      passthru.tests = {