pyrox.dev
Merge pull request #132680 from zimbatm/gradle-7.1.1
+19
-17
pkgs/development/tools/build-managers/gradle/default.nix
+19
-17
pkgs/development/tools/build-managers/gradle/default.nix
···
9
9
url = "https://services.gradle.org/distributions/${name}-bin.zip";
10
10
};
11
11
};
12
-
in rec {
13
-
gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation {
12
+
in
13
+
rec {
14
+
gradleGen = { name, src, nativeVersion }: stdenv.mkDerivation {
14
15
inherit name src nativeVersion;
15
16
16
17
dontBuild = true;
···
27
28
'';
28
29
29
30
fixupPhase = if (!stdenv.isLinux) then ":" else
30
-
let arch = if stdenv.is64bit then "amd64" else "i386"; in ''
31
-
mkdir patching
32
-
pushd patching
33
-
jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
34
-
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
35
-
jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
36
-
mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
37
-
popd
31
+
let arch = if stdenv.is64bit then "amd64" else "i386"; in
32
+
''
33
+
mkdir patching
34
+
pushd patching
35
+
jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
36
+
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
37
+
jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
38
+
mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
39
+
popd
38
40
39
-
# The scanner doesn't pick up the runtime dependency in the jar.
40
-
# Manually add a reference where it will be found.
41
-
mkdir $out/nix-support
42
-
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
43
-
'';
41
+
# The scanner doesn't pick up the runtime dependency in the jar.
42
+
# Manually add a reference where it will be found.
43
+
mkdir $out/nix-support
44
+
echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
45
+
'';
44
46
45
47
nativeBuildInputs = [ makeWrapper unzip ];
46
48
buildInputs = [ java ];
···
64
66
gradle_latest = gradle_7;
65
67
66
68
gradle_7 = gradleGen (gradleSpec {
67
-
version = "7.1";
69
+
version = "7.1.1";
68
70
nativeVersion = "0.22-milestone-16";
69
-
sha256 = "0yyqksq3zza7r9ls389ha81l3s768j7dfdqiwk3846qy4wcyxsrd";
71
+
sha256 = "0p9nss2xywwhjbpdcyma3d0ijvkav9hzmldpkcp447ch92cqd2xz";
70
72
});
71
73
72
74
gradle_6_8 = gradleGen (gradleSpec {