@@ -1,22 +1,27 @@
1−{ stdenv, fetchurl, gradle_2_5, perl, makeWrapper, jre, makeDesktopItem, writeText, runtimeShell }:
1+{ stdenv, fetchFromGitHub, jre, jdk, makeDesktopItem, perl, writeText, runtimeShell }:
22
33let
4− version = "1.4.0";
5− name = "jd-gui-${version}";
6−
7− src = fetchurl {
8− url = "https://github.com/java-decompiler/jd-gui/archive/v${version}.tar.gz";
9− sha256 = "0anz7szlr5kgmsmkyv34jdynsnk8v6kvibcyz98jsd96fh725lax";
4+ pname = "jd-gui";
5+ version = "1.6.5";
6+
7+ src = fetchFromGitHub {
8+ owner = "java-decompiler";
9+ repo = pname;
10+ rev = "v${version}";
11+ sha256 = "0yn2xcwznig941pw2f3wi8ixz1wprxcn9wl0g2ggdzx51rfwgzzi";
1012 };
1113
1214 deps = stdenv.mkDerivation {
13− name = "${name}-deps";
15+ name = "${pname}-deps";
1416 inherit src;
15− nativeBuildInputs = [ gradle_2_5 perl ];
17+
18+ nativeBuildInputs = [ jdk perl ];
19+
20+ patchPhase = "patchShebangs gradlew";
1621
1722 buildPhase = ''
1823 export GRADLE_USER_HOME=$(mktemp -d);
19− gradle --no-daemon build
24+ ./gradlew --no-daemon jar
2025 '';
2126
2227 # Mavenize dependency paths
@@ -25,11 +30,12 @@ let
2530 find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \
2631 | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \
2732 | sh
33+ cp -r $GRADLE_USER_HOME/wrapper $out
2834 '';
2935
3036 outputHashAlgo = "sha256";
3137 outputHashMode = "recursive";
32− outputHash = "1apmqiphnav79m4rdii58h7f4qslpfig4qybyyl2fr7zk92gv3l9";
38+ outputHash = "1s4p91iiyikrsgvpzkhw3jm5lsm0jpzp7iw7afdhhl9jm18igs70";
3339 };
3440
3541 # Point to our local deps repo
@@ -59,18 +65,24 @@ let
5965 comment = "Java Decompiler JD-GUI";
6066 desktopName = "JD-GUI";
6167 genericName = "Java Decompiler";
62− mimeType = "application/x-java-archive;application/x-java";
68+ mimeType = "application/java;application/java-vm;application/java-archive";
6369 categories = "Development;Debugger;";
70+ extraEntries="StartupWMClass=org-jd-gui-App";
6471 };
6572
66−in stdenv.mkDerivation {
67− inherit name version src;
73+in stdenv.mkDerivation rec {
74+ inherit pname version src;
75+ name = "${pname}-${version}";
6876
69− nativeBuildInputs = [ gradle_2_5 perl makeWrapper ];
77+ nativeBuildInputs = [ jdk ];
78+
79+ patchPhase = "patchShebangs gradlew";
7080
7181 buildPhase = ''
7282 export GRADLE_USER_HOME=$(mktemp -d)
73− gradle --offline --no-daemon --info --init-script ${gradleInit} jar
83+ cp -r ${deps}/wrapper $GRADLE_USER_HOME
84+ chmod u+w $GRADLE_USER_HOME/wrapper/dists/gradle*/*/*.lck
85+ ./gradlew --offline --no-daemon --info --init-script ${gradleInit} jar
7486 '';
7587
7688 installPhase = let
@@ -83,18 +95,16 @@ in stdenv.mkDerivation {
8395 cat > $out/bin/jd-gui <<EOF
8496 #!${runtimeShell}
8597 export JAVA_HOME=${jre}
86− ${jre}/bin/java -jar ${jar} $@
98+ exec ${jre}/bin/java -jar ${jar} "\$@"
8799 EOF
88100 chmod +x $out/bin/jd-gui
89101
90102 ${(desktopItem "$out/bin/jd-gui").buildCommand}
91103 '';
92104
93− dontStrip = true;
94−
95105 meta = with stdenv.lib; {
96106 description = "Fast Java Decompiler with powerful GUI";
97− homepage = "http://jd.benow.ca/";
107+ homepage = "https://java-decompiler.github.io/";
98108 license = licenses.gpl3;
99109 platforms = platforms.unix;
100110 maintainers = [ maintainers.thoughtpolice ];