Merge pull request #212736 from Mic92/signal-desktop

This commit is contained in:
Sandro 2023-01-26 11:47:45 +01:00 committed by GitHub
commit 46713a5f4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions

View file

@ -1,13 +1,12 @@
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
signal-desktop = {
dir = "Signal";
version = "6.2.0";
hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc=";
version = "6.3.0";
hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY=";
};
signal-desktop-beta = {
dir = "Signal Beta";
ringrtcPrefix = "@signalapp/";
version = "6.3.0-beta.1";
hash = "sha256-cYJWhnyiWULnIZvI2/k1koLCd2zrL4CVMohcnSZa/TY=";
version = "6.4.0-beta.1";
hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU=";
};
}

View file

@ -1,6 +1,5 @@
{ pname
, dir
, ringrtcPrefix ? ""
, version
, hash
, stdenv
@ -161,7 +160,7 @@ stdenv.mkDerivation rec {
--replace "/opt/${dir}/${pname}" $out/bin/${pname}
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/${ringrtcPrefix}ringrtc/build/linux/libringrtc-x64.node"
patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/ringrtc/build/linux/libringrtc-x64.node"
'';
# Tests if the application launches and waits for "Link your phone to Signal Desktop":