gradle: Add variable nativeVersion
This commit is contained in:
parent
f11b7cf579
commit
2896042738
@ -1,8 +1,8 @@
|
|||||||
{ stdenv, fetchurl, unzip, jdk, makeWrapper }:
|
{ stdenv, fetchurl, unzip, jdk, makeWrapper }:
|
||||||
|
|
||||||
rec {
|
rec {
|
||||||
gradleGen = {name, src} : stdenv.mkDerivation rec {
|
gradleGen = {name, src, nativeVersion} : stdenv.mkDerivation rec {
|
||||||
inherit name src;
|
inherit name src nativeVersion;
|
||||||
|
|
||||||
dontBuild = true;
|
dontBuild = true;
|
||||||
|
|
||||||
@ -21,10 +21,10 @@ rec {
|
|||||||
let arch = if stdenv.is64bit then "amd64" else "i386"; in ''
|
let arch = if stdenv.is64bit then "amd64" else "i386"; in ''
|
||||||
mkdir patching
|
mkdir patching
|
||||||
pushd patching
|
pushd patching
|
||||||
jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.11.jar
|
jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
|
||||||
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
|
patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
|
||||||
jar cf native-platform-linux-${arch}-0.11.jar .
|
jar cf native-platform-linux-${arch}-${nativeVersion}.jar .
|
||||||
mv native-platform-linux-${arch}-0.11.jar $out/lib/gradle/lib/
|
mv native-platform-linux-${arch}-${nativeVersion}.jar $out/lib/gradle/lib/
|
||||||
popd
|
popd
|
||||||
|
|
||||||
# The scanner doesn't pick up the runtime dependency in the jar.
|
# The scanner doesn't pick up the runtime dependency in the jar.
|
||||||
@ -53,6 +53,7 @@ rec {
|
|||||||
|
|
||||||
gradle_latest = gradleGen rec {
|
gradle_latest = gradleGen rec {
|
||||||
name = "gradle-3.2";
|
name = "gradle-3.2";
|
||||||
|
nativeVersion = "0.11";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
||||||
@ -62,6 +63,7 @@ rec {
|
|||||||
|
|
||||||
gradle_2_14 = gradleGen rec {
|
gradle_2_14 = gradleGen rec {
|
||||||
name = "gradle-2.14.1";
|
name = "gradle-2.14.1";
|
||||||
|
nativeVersion = "0.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
||||||
@ -71,6 +73,7 @@ rec {
|
|||||||
|
|
||||||
gradle_2_5 = gradleGen rec {
|
gradle_2_5 = gradleGen rec {
|
||||||
name = "gradle-2.5";
|
name = "gradle-2.5";
|
||||||
|
nativeVersion = "0.10";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
url = "http://services.gradle.org/distributions/${name}-bin.zip";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user