Merge pull request #212736 from Mic92/signal-desktop
This commit is contained in:
commit
46713a5f4e
2 changed files with 5 additions and 7 deletions
|
@ -1,13 +1,12 @@
|
||||||
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) {
|
||||||
signal-desktop = {
|
signal-desktop = {
|
||||||
dir = "Signal";
|
dir = "Signal";
|
||||||
version = "6.2.0";
|
version = "6.3.0";
|
||||||
hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc=";
|
hash = "sha256-Mg7znebHiREC9QI5T7bWT4QXL8biDVBp0Z6Jgeid/gY=";
|
||||||
};
|
};
|
||||||
signal-desktop-beta = {
|
signal-desktop-beta = {
|
||||||
dir = "Signal Beta";
|
dir = "Signal Beta";
|
||||||
ringrtcPrefix = "@signalapp/";
|
version = "6.4.0-beta.1";
|
||||||
version = "6.3.0-beta.1";
|
hash = "sha256-GR7RWFT20i5dx6XYrp73inCOQ2Hj2UjSXf5jmjfDKMU=";
|
||||||
hash = "sha256-cYJWhnyiWULnIZvI2/k1koLCd2zrL4CVMohcnSZa/TY=";
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
{ pname
|
{ pname
|
||||||
, dir
|
, dir
|
||||||
, ringrtcPrefix ? ""
|
|
||||||
, version
|
, version
|
||||||
, hash
|
, hash
|
||||||
, stdenv
|
, stdenv
|
||||||
|
@ -161,7 +160,7 @@ stdenv.mkDerivation rec {
|
||||||
--replace "/opt/${dir}/${pname}" $out/bin/${pname}
|
--replace "/opt/${dir}/${pname}" $out/bin/${pname}
|
||||||
|
|
||||||
autoPatchelf --no-recurse -- "$out/lib/${dir}/"
|
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":
|
# Tests if the application launches and waits for "Link your phone to Signal Desktop":
|
||||||
|
|
Loading…
Reference in a new issue