public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jd-gui: use gradle from nixpkgs

Browse Source 
It builds just fine with the packaged gradle, no reason to pull in
another impure dependency.
This commit is contained in:
Milan Pässler 2020-01-10 04:16:48 +01:00
parent 8337bb607c
commit 2e6053dade
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/tools/security/jd-gui/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, jre, jdk, makeDesktopItem, perl, writeText, runtimeShell }: { stdenv, fetchFromGitHub, jre, jdk, gradle, makeDesktopItem, perl, writeText, runtimeShell }:
let let
pname = "jd-gui"; pname = "jd-gui";
@ -15,13 +15,11 @@ let
name = "${pname}-deps"; name = "${pname}-deps";
inherit src; inherit src;
nativeBuildInputs = [ jdk perl ]; nativeBuildInputs = [ jdk perl gradle ];
patchPhase = "patchShebangs gradlew";
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d); export GRADLE_USER_HOME=$(mktemp -d);
./gradlew --no-daemon jar gradle --no-daemon jar
''; '';
# Mavenize dependency paths # Mavenize dependency paths
@ -30,12 +28,11 @@ let
find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
| perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
| sh | sh
cp -r $GRADLE_USER_HOME/wrapper $out
''; '';
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHashMode = "recursive"; outputHashMode = "recursive";
outputHash = "1s4p91iiyikrsgvpzkhw3jm5lsm0jpzp7iw7afdhhl9jm18igs70"; outputHash = "1rbsi4i8xihsihkmxacgawlwjyixmhm2n9mn8ykv8595iyifzw6w";
}; };
# Point to our local deps repo # Point to our local deps repo
@ -74,15 +71,11 @@ in stdenv.mkDerivation rec {
inherit pname version src; inherit pname version src;
name = "${pname}-${version}"; name = "${pname}-${version}";
nativeBuildInputs = [ jdk ]; nativeBuildInputs = [ jdk gradle ];
patchPhase = "patchShebangs gradlew";
buildPhase = '' buildPhase = ''
export GRADLE_USER_HOME=$(mktemp -d) export GRADLE_USER_HOME=$(mktemp -d)
cp -r ${deps}/wrapper $GRADLE_USER_HOME gradle --offline --no-daemon --info --init-script ${gradleInit} jar
chmod u+w $GRADLE_USER_HOME/wrapper/dists/gradle*/*/*.lck
./gradlew --offline --no-daemon --info --init-script ${gradleInit} jar
''; '';
installPhase = let installPhase = let