Skip to content

Commit 83972e4

Browse files
authored
gradle: do not include udev on Mac (NixOS#374559)
Do not include udev in the gradle derivation on mac
1 parent eac99db commit 83972e4

File tree

1 file changed

+5
-3
lines changed
  • pkgs/development/tools/build-managers/gradle

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ rec {
9999
varDefs = concatStringsSep "\n" (
100100
map (x: " --set ${x} \\") ([ "JAVA_HOME ${java}" ] ++ toolchain.varDefs)
101101
);
102-
jnaLibraryPath = lib.makeLibraryPath [ udev ];
102+
jnaLibraryPath = if stdenv.hostPlatform.isLinux then lib.makeLibraryPath [ udev ] else "";
103+
jnaFlag =
104+
if stdenv.hostPlatform.isLinux then "--add-flags \"-Djna.library.path=${jnaLibraryPath}\"" else "";
103105
in
104106
''
105107
mkdir -pv $out/lib/gradle/
@@ -109,7 +111,7 @@ rec {
109111
test -f $gradle_launcher_jar
110112
makeWrapper ${java}/bin/java $out/bin/gradle \
111113
${varDefs}
112-
--add-flags "-Djna.library.path=${jnaLibraryPath}" \
114+
${jnaFlag} \
113115
--add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}"
114116
'';
115117

@@ -157,7 +159,7 @@ rec {
157159
# Gradle will refuse to start without _both_ 5 and 6 versions of ncurses.
158160
echo ${ncurses5} >> $out/nix-support/manual-runtime-dependencies
159161
echo ${ncurses6} >> $out/nix-support/manual-runtime-dependencies
160-
echo ${udev} >> $out/nix-support/manual-runtime-dependencies
162+
${lib.optionalString stdenv.hostPlatform.isLinux "echo ${udev} >> $out/nix-support/manual-runtime-dependencies"}
161163
'';
162164

163165
passthru.tests = {

0 commit comments

Comments
 (0)