From ba79c475631ca67fab94b58ebb4683a76daed185 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 22 Jun 2025 11:37:21 +0200
Subject: [PATCH] signal-desktop-bin: 7.55.0 -> 7.58.0 (#413044)

* signal-desktop-bin: 7.55.0 -> 7.58.0

* signal-desktop-bin(aarch64-linux): 7.55.0 -> 7.58.0

* signal-desktop-bin(darwin): 7.55.0 -> 7.58.0

* signal-desktop-bin: add commandLineArgs
---
 pkgs/by-name/si/signal-desktop-bin/generic.nix         |  4 ++++
 pkgs/by-name/si/signal-desktop-bin/package.nix         | 10 +++++++---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix   | 10 +++++-----
 .../si/signal-desktop-bin/signal-desktop-darwin.nix    |  4 ++--
 pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix  |  8 ++++----
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix
index 978ba0ae4dfe..9b0fd4aec65c 100644
--- a/pkgs/by-name/si/signal-desktop-bin/generic.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix
@@ -51,6 +51,9 @@
   libpulseaudio,
   xdg-utils,
   wayland,
+
+  # command line arguments which are always set e.g "--password-store=kwallet6"
+  commandLineArgs,
 }:
 
 {
@@ -255,6 +258,7 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
       --suffix PATH : ${lib.makeBinPath [ xdg-utils ]}
+      --add-flags ${lib.escapeShellArg commandLineArgs}
     )
 
     # Fix the desktop link
diff --git a/pkgs/by-name/si/signal-desktop-bin/package.nix b/pkgs/by-name/si/signal-desktop-bin/package.nix
index f2faec1ccb35..79e6becbe892 100644
--- a/pkgs/by-name/si/signal-desktop-bin/package.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/package.nix
@@ -1,7 +1,11 @@
-{ stdenv, callPackage }:
+{
+  stdenv,
+  callPackage,
+  commandLineArgs ? "",
+}:
 if stdenv.hostPlatform.system == "aarch64-linux" then
-  callPackage ./signal-desktop-aarch64.nix { }
+  callPackage ./signal-desktop-aarch64.nix { inherit commandLineArgs; }
 else if stdenv.hostPlatform.isDarwin then
   callPackage ./signal-desktop-darwin.nix { }
 else
-  callPackage ./signal-desktop.nix { }
+  callPackage ./signal-desktop.nix { inherit commandLineArgs; }
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index 40c707422afe..1f1f5344e11f 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
-{ callPackage }:
-callPackage ./generic.nix { } {
+{ callPackage, commandLineArgs }:
+callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.55.0";
+  version = "7.58.0";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09073923-signal-desktop/signal-desktop-7.55.0-1.fc42.aarch64.rpm";
-  hash = "sha256-rRt2hYyj6kyN0RCupy+hpRJuzq0aaUzP2tsVr2Qd5V4=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09183198-signal-desktop/signal-desktop-7.58.0-1.fc42.aarch64.rpm";
+  hash = "sha256-0Ix+1SdvmKLVbtGzbjUupvVzdWAJFNQ6sSAIt+T9fHo=";
 }
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index 29140ecf699d..12d651efd925 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.55.0";
+  version = "7.58.0";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-9PD4SDTACjKSBqIdv3CFtKhRKA5ugbQe2AcWA4hFoqs=";
+    hash = "sha256-yOPYG9bCSCIE1L8RgEXCy6pJUHONBh9SpPY4WDfZEho=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 31e3b0c7dc08..9bb3f231165c 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
-{ callPackage }:
-callPackage ./generic.nix { } rec {
+{ callPackage, commandLineArgs }:
+callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.55.0";
+  version = "7.58.0";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-uc623M/GiIfED1mTFnXUggnFdvDBmngrsdTIlq6QxqM=";
+  hash = "sha256-zZ63AE+qb0lrGtGUtU4FV6pHDO2DUV2vknz3a4+f4aA=";
 }