cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #111513 from devzero/master

Browse source 
signal-cli: 0.6.12 -> 0.7.4
This commit is contained in:
Graham Christensen 2021-01-31 20:38:57 -05:00 committed by GitHub
commit 5b896d3797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkgs/applications/networking/instant-messengers/signal-cli/default.nix
View file

@ -1,13 +1,13 @@
{ stdenv, lib, fetchurl, makeWrapper, jre_headless, libmatthew_java, dbus, dbus_java }: { stdenv, lib, fetchurl, makeWrapper, openjdk11_headless, libmatthew_java, dbus, dbus_java }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "signal-cli"; pname = "signal-cli";
version = "0.6.12"; version = "0.7.4";
# Building from source would be preferred, but is much more involved. # Building from source would be preferred, but is much more involved.
src = fetchurl { src = fetchurl {
url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
sha256 = "0i1y2p5qi2bwhkm8sv0wkb0lfi2vm26qalnpg6kn0ikcxkqkq5bc"; sha256 = "18dv2944nsryl6372jqgb52z3s1grvgfc5sb1b1rgn0y84g8g46n";
}; };
buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
@ -18,15 +18,15 @@ stdenv.mkDerivation rec {
cp -r lib $out/lib cp -r lib $out/lib
cp bin/signal-cli $out/bin/signal-cli cp bin/signal-cli $out/bin/signal-cli
'' + (if stdenv.isLinux then '' '' + (if stdenv.isLinux then ''
makeWrapper ${jre_headless}/bin/java $out/bin/signal-cli \ makeWrapper ${openjdk11_headless}/bin/java $out/bin/signal-cli \
--set JAVA_HOME "${jre_headless}" \ --set JAVA_HOME "${openjdk11_headless}" \
--add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \ --add-flags "-classpath '$out/lib/*:${libmatthew_java}/lib/jni'" \
--add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \ --add-flags "-Djava.library.path=${libmatthew_java}/lib/jni:${dbus_java}/share/java/dbus:$out/lib" \
--add-flags "org.asamk.signal.Main" --add-flags "org.asamk.signal.Main"
'' else '' '' else ''
wrapProgram $out/bin/signal-cli \ wrapProgram $out/bin/signal-cli \
--prefix PATH : ${lib.makeBinPath [ jre_headless ]} \ --prefix PATH : ${lib.makeBinPath [ openjdk11_headless ]} \
--set JAVA_HOME ${jre_headless} --set JAVA_HOME ${openjdk11_headless}
''); '');
# Execution in the macOS (10.13) sandbox fails with # Execution in the macOS (10.13) sandbox fails with