@@ -3,11 +3,12 @@ lib, stdenv
33, makeWrapper
44, makeDesktopItem
55, fetchurl
6+, jdk11
67, jdk8
78}:
89
910let
10− generic = { version, sha256, ... }@attrs:
11+ generic = { version, sha256, platform ? "", jdk, ... }@attrs:
1112 let
1213 desktopItem = makeDesktopItem {
1314 categories = "Network;Development;WebDevelopment;Java;";
@@ -25,13 +26,13 @@ let
2526 inherit version;
2627
2728 src = fetchurl {
28− url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}.tar.gz";
29+ url = "https://www.charlesproxy.com/assets/release/${version}/charles-proxy-${version}${platform}.tar.gz";
2930 inherit sha256;
3031 };
3132 nativeBuildInputs = [ makeWrapper ];
3233
3334 installPhase = ''
34− makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \
35+ makeWrapper ${jdk}/bin/java $out/bin/charles \
3536 --add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
3637
3738 for fn in lib/*.jar; do
@@ -56,12 +57,15 @@ let
5657
5758in {
5859 charles4 = (generic {
59− version = "4.2.8";
60− sha256 = "1jzjdhzxgrq7pdfryfkg0hsjpyni14ma4x8jbdk1rqll78ccr080";
60+ version = "4.6.1";
61+ sha256 = "1kl83jjj5wjhdpj34gcj04vf1asxlqlfx9zi91ln4v90swlaaclv";
62+ platform = "_amd64";
63+ jdk = jdk11;
6164 });
6265 charles3 = (generic {
6366 version = "3.12.3";
6467 sha256 = "13zk82ny1w5zd9qcs9qkq0kdb22ni5byzajyshpxdfm4zv6p32ss";
68+ jdk = jdk8.jre;
6569 });
6670}
6771