pyrox.dev
Merge pull request #302437 from pinpox/signal-cli-update-0.13.1
signal-cli: 0.12.8 -> 0.13.2
authored by Peder Bergebakken Sundt and committed by GitHub 0c44c57b 65404392
+7
-7
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+7
-7
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
···
1
-
{ stdenv, lib, fetchurl, makeWrapper, openjdk17_headless, libmatthew_java, dbus, dbus_java }:
2
3
stdenv.mkDerivation rec {
4
pname = "signal-cli";
5
-
version = "0.12.8";
6
7
# Building from source would be preferred, but is much more involved.
8
src = fetchurl {
9
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
10
-
hash = "sha256-jBz1D1Uz3z+QYj+zAOrbSIkZZeKWSwU3/pHI+sDjJHw=";
11
};
12
13
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
···
18
cp -r lib $out/lib
19
cp bin/signal-cli $out/bin/signal-cli
20
'' + (if stdenv.isLinux then ''
21
-
makeWrapper ${openjdk17_headless}/bin/java $out/bin/signal-cli \
22
-
--set JAVA_HOME "${openjdk17_headless}" \
23
--add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
24
--add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
25
--add-flags "org.asamk.signal.Main"
26
'' else ''
27
wrapProgram $out/bin/signal-cli \
28
-
--prefix PATH : ${lib.makeBinPath [ openjdk17_headless ]} \
29
-
--set JAVA_HOME ${openjdk17_headless}
30
'');
31
32
# Execution in the macOS (10.13) sandbox fails with
···
1
+
{ stdenv, lib, fetchurl, makeWrapper, openjdk21_headless, libmatthew_java, dbus, dbus_java }:
2
3
stdenv.mkDerivation rec {
4
pname = "signal-cli";
5
+
version = "0.13.2";
6
7
# Building from source would be preferred, but is much more involved.
8
src = fetchurl {
9
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
10
+
hash = "sha256-5+pIkRdcFWTNmsSN2tHSy6XMQfUpGSddGsdw5guWzjA=";
11
};
12
13
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
···
18
cp -r lib $out/lib
19
cp bin/signal-cli $out/bin/signal-cli
20
'' + (if stdenv.isLinux then ''
21
+
makeWrapper ${openjdk21_headless}/bin/java $out/bin/signal-cli \
22
+
--set JAVA_HOME "${openjdk21_headless}" \
23
--add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
24
--add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
25
--add-flags "org.asamk.signal.Main"
26
'' else ''
27
wrapProgram $out/bin/signal-cli \
28
+
--prefix PATH : ${lib.makeBinPath [ openjdk21_headless ]} \
29
+
--set JAVA_HOME ${openjdk21_headless}
30
'');
31
32
# Execution in the macOS (10.13) sandbox fails with