From 480b60e5006f70b30c07c9f7760108e9396110f8 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:45:10 +0100 Subject: [PATCH 1/4] signal-desktop: 7.31.0 -> 7.32.0 (cherry picked from commit 34d1552a83d57b488467ea3aa7302313f9cd5ff2) --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index eba218c54994..f1fc184a8b12 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.31.0"; + version = "7.32.0"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-7UumNusnexW3ujA65SzxKAdRrWxmKrgZFzK0GMlURaM="; + hash = "sha256-3D1Pou+x8mJBzWAKRq8YDcFOJXKKnA8ksMJ3SR8C+SU="; } From 13a9721f53a4e92ae5e74cb3a24ae3ca8379f198 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:50:28 +0100 Subject: [PATCH 2/4] signal-desktop-(generic): add libpulseaudio to bui ldInputs (cherry picked from commit 550ae7093ebe8d4863988c0c701d2e7b29bc622c) --- .../networking/instant-messengers/signal-desktop/generic.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 2b60e2ae6b84..dd50e424be8a 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -156,6 +156,7 @@ stdenv.mkDerivation rec { libXrender libXtst libappindicator-gtk3 + libpulseaudio libnotify libuuid mesa # for libgbm From c82de5208dc2d4d1ed4f106344badceadc3d9208 Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:51:25 +0100 Subject: [PATCH 3/4] signal-desktop-beta:7.32.0-beta.1 -> 7.33.0-beta.1 (cherry picked from commit e630ab066e270a522e817985cbee640b8299e6be) --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index a0d752151b96..fa07e2d1e477 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.32.0-beta.1"; + version = "7.33.0-beta.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-WrHF7Y8OcEOr+W/Jhc+Hj5jCtOjKigZ02N9N/hE+XLA="; + hash = "sha256-17ZSdfGS28OqXb0UBbel+tR8UTh07pPQNIoKmuUtzZ0="; } From 98cea74e4987edfeb7aafa646998f29e2c5847bb Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Thu, 7 Nov 2024 16:52:36 +0100 Subject: [PATCH 4/4] signal-desktop-(generic): use --replace-fail (cherry picked from commit 614795583f3a13d4b1e055425898c4e5c2c2b5b8) --- .../networking/instant-messengers/signal-desktop/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index dd50e424be8a..6542405e1f4e 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -236,7 +236,7 @@ stdenv.mkDerivation rec { # Fix the desktop link substituteInPlace $out/share/applications/${pname}.desktop \ - --replace "/opt/${dir}/${pname}" $out/bin/${pname} \ + --replace-fail "/opt/${dir}/${pname}" $out/bin/${pname} \ --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal" # Note: The following path contains bundled libraries: