Unverified Commit 83972e4a authored by Nathan Jaremko's avatar Nathan Jaremko Committed by GitHub
Browse files

gradle: do not include udev on Mac (#374559) 

Do not include udev in the gradle derivation on mac
parent eac99db3

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

+5 −3
Original line number Diff line number Diff line
@@ -99,7 +99,9 @@ rec { 
          varDefs = concatStringsSep "\n" (

            map (x: "  --set ${x} \\") ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs)

          );

          jnaLibraryPath = lib.makeLibraryPath [ udev ];

          jnaLibraryPath = if stdenv.hostPlatform.isLinux then lib.makeLibraryPath [ udev ] else "";

          jnaFlag =

            if stdenv.hostPlatform.isLinux then "--add-flags \"-Djna.library.path=${jnaLibraryPath}\"" else "";

        in

        ''

          mkdir -pv $out/lib/gradle/
@@ -109,7 +111,7 @@ rec { 
          test -f $gradle_launcher_jar

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

            ${varDefs}

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

            ${jnaFlag} \

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

        '';
@@ -157,7 +159,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

          ${lib.optionalString stdenv.hostPlatform.isLinux "echo ${udev} >> $out/nix-support/manual-runtime-dependencies"}

        '';



      passthru.tests = {