Unverified Commit 46713a5f authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #212736 from Mic92/signal-desktop

parents d41a8f77 ed7ffb0e

pkgs/applications/networking/instant-messengers/signal-desktop/default.nix

+4 −5
Original line number Diff line number Diff line 
{ 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=";

  };

}

pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix

+1 −2
Original line number Diff line number Diff line 
{ 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":