lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

jd-gui: patch to work with Gradle 6

+28 -7
+28 -7
pkgs/tools/security/jd-gui/default.nix
··· 1 - { lib, stdenv, fetchFromGitHub, jre, jdk, gradle_5, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell }: 1 + { lib 2 + , stdenv 3 + , fetchFromGitHub 4 + , fetchpatch 5 + , jre 6 + , jdk 7 + , gradle_6 8 + , makeDesktopItem 9 + , copyDesktopItems 10 + , perl 11 + , writeText 12 + , runtimeShell 13 + }: 2 14 3 15 let 4 16 pname = "jd-gui"; ··· 8 20 owner = "java-decompiler"; 9 21 repo = pname; 10 22 rev = "v${version}"; 11 - sha256 = "010bd3q2m4jy4qz5ahdx86b5f558s068gbjlbpdhq3bhh4yrjy20"; 23 + hash = "sha256-QHiZPYFwDQzbXVSuhwzQqBRXlkG9QVU+Jl6SKvBoCwQ="; 12 24 }; 13 25 26 + patches = [ 27 + # https://github.com/java-decompiler/jd-gui/pull/362 28 + (fetchpatch { 29 + name = "nebula-plugin-gradle-6-compatibility.patch"; 30 + url = "https://github.com/java-decompiler/jd-gui/commit/91f805f9dc8ce0097460e63c8095ccea870687e6.patch"; 31 + hash = "sha256-9eaM9Mx2FaKIhGSOHjATKN/CrtvJeXyrH8Mdx8LNtpE="; 32 + }) 33 + ]; 34 + 14 35 deps = stdenv.mkDerivation { 15 36 name = "${pname}-deps"; 16 - inherit src; 37 + inherit src patches; 17 38 18 - nativeBuildInputs = [ jdk perl gradle_5 ]; 39 + nativeBuildInputs = [ jdk perl gradle_6 ]; 19 40 20 41 buildPhase = '' 21 42 export GRADLE_USER_HOME=$(mktemp -d); ··· 32 53 33 54 outputHashAlgo = "sha256"; 34 55 outputHashMode = "recursive"; 35 - outputHash = "1qil12s0daxpxj5xj5dj6s2k89is0kiir2vcafkm3lasc41acmk3"; 56 + outputHash = "sha256-gqUyZE+MoZRYCcJx95Qc4dZIC3DZvxee6UQhpfveDI4="; 36 57 }; 37 58 38 59 # Point to our local deps repo ··· 68 89 }; 69 90 70 91 in stdenv.mkDerivation rec { 71 - inherit pname version src; 92 + inherit pname version src patches; 72 93 name = "${pname}-${version}"; 73 94 74 - nativeBuildInputs = [ jdk gradle_5 copyDesktopItems ]; 95 + nativeBuildInputs = [ jdk gradle_6 copyDesktopItems ]; 75 96 76 97 buildPhase = '' 77 98 export GRADLE_USER_HOME=$(mktemp -d)