diff options
author | joachifm <joachifm@users.noreply.github.com> | 2016-04-01 22:24:57 +0000 |
---|---|---|
committer | joachifm <joachifm@users.noreply.github.com> | 2016-04-01 22:24:57 +0000 |
commit | 1bcbc4994dd3fd46febc25ee665c444729fb0f26 (patch) | |
tree | d8c91e58008d4151af0a42a6ba2a79b1fb0884fe /pkgs/development | |
parent | 94396b8d915a9a559cbafa306f398d07847b1c55 (diff) | |
parent | bbfad5111a3e2cb273e975945ac4fb4cb30a9cd4 (diff) | |
download | nixlib-1bcbc4994dd3fd46febc25ee665c444729fb0f26.tar nixlib-1bcbc4994dd3fd46febc25ee665c444729fb0f26.tar.gz nixlib-1bcbc4994dd3fd46febc25ee665c444729fb0f26.tar.bz2 nixlib-1bcbc4994dd3fd46febc25ee665c444729fb0f26.tar.lz nixlib-1bcbc4994dd3fd46febc25ee665c444729fb0f26.tar.xz nixlib-1bcbc4994dd3fd46febc25ee665c444729fb0f26.tar.zst nixlib-1bcbc4994dd3fd46febc25ee665c444729fb0f26.zip |
Merge pull request #14326 from reltuk/gradle-native-lib-fix
gradle: Fix gradle-2.12 on Linux to find libstdc++.so.6 reference.
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/tools/build-managers/gradle/default.nix | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index c2b24c69904f..96477e55d26a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -4,6 +4,8 @@ rec { gradleGen = {name, src} : stdenv.mkDerivation rec { inherit name src; + buildPhase = ":"; + installPhase = '' mkdir -pv $out/lib/gradle/ cp -rv lib/ $out/lib/gradle/ @@ -15,7 +17,21 @@ rec { --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" ''; - phases = "unpackPhase installPhase"; + fixupPhase = if (!stdenv.isLinux) then ":" else + let arch = if stdenv.is64bit then "amd64" else "i386"; in '' + mkdir patching + pushd patching + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.10.jar + patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so + jar cf native-platform-linux-${arch}-0.10.jar . + mv native-platform-linux-${arch}-0.10.jar $out/lib/gradle/lib/ + popd + + # The scanner doesn't pick up the runtime dependency in the jar. + # Manually add a reference where it will be found. + mkdir $out/nix-support + echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies + ''; buildInputs = [ unzip jdk makeWrapper ]; |