@@ -1,13 +1,13 @@
1−{ stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }:
1+{ stdenv, lib, fetchurl, makeWrapper, openjdk17_headless, libmatthew_java, dbus, dbus_java }:
22
33stdenv.mkDerivation rec {
44 pname = "signal-cli";
5− version = "0.9.2";
5+ version = "0.10.0";
66
77 # Building from source would be preferred, but is much more involved.
88 src = fetchurl {
99 url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
10− sha256 = "sha256-CumrIlOPmvQ3x7Ua5I2G7ZlTSAbhLgAQMPUg4I5WCeQ=";
10+ sha256 = "sha256-2JofDCq9HsF+2DO5wzObzAALbJmJ9HJgmuuSJQDu1vY=";
1111 };
1212
1313 buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
@@ -18,15 +18,15 @@ stdenv.mkDerivation rec {
1818 cp -r lib $out/lib
1919 cp bin/signal-cli $out/bin/signal-cli
2020 '' + (if stdenv.isLinux then ''
21− makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \
22− --set JAVA_HOME "${openjdk11_headless}" \
21+ makeWrapper ${openjdk17_headless}/bin/java $out/bin/signal-cli \
22+ --set JAVA_HOME "${openjdk17_headless}" \
2323 --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
2424 --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
2525 --add-flags "org.asamk.signal.Main"
2626 '' else ''
2727 wrapProgram $out/bin/signal-cli \
28− --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \
29− --set JAVA_HOME ${openjdk11_headless}
28+ --prefix PATH : ${lib.makeBinPath [ openjdk17_headless ]} \
29+ --set JAVA_HOME ${openjdk17_headless}
3030 '');
3131
3232 # Execution in the macOS (10.13) sandbox fails with