signal-desktop: refactor file names and targetPlatform

NixOS · Apr 29, 2024 · dd80320 · dd80320
1 parent c462700
commit dd80320
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 22 deletions.
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,9 +1,4 @@
-{ hostPlatform, callPackage }: {
-  signal-desktop = {
-    aarch64-linux = callPackage ./signal-desktop-aarch64.nix { };
-    x86_64-linux = callPackage ./signal-desktop.nix { };
-    aarch64-darwin = callPackage ./signal-desktop-aarch64-darwin.nix { };
-    x86_64-darwin = callPackage ./signal-desktop-darwin.nix { };
-  }.${hostPlatform.system};
-  signal-desktop-beta = callPackage ./signal-desktop-beta.nix{ };
+{ targetPlatform, callPackage }: {
+  signal-desktop = callPackage ./signal-desktop-${targetPlatform.system}.nix { };
+  signal-desktop-beta = callPackage ./signal-desktop-beta.nix { };
 }
diff --git a/...signal-desktop/signal-desktop-aarch64.nix → ...-desktop/signal-desktop-aarch64-linux.nix b/...signal-desktop/signal-desktop-aarch64.nix → ...-desktop/signal-desktop-aarch64-linux.nix
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-darwin.nix
diff --git a/...pplications/networking/instant-messengers/signal-desktop/signal-desktop-x86_64-darwin.nix b/...pplications/networking/instant-messengers/signal-desktop/signal-desktop-x86_64-darwin.nix
@@ -1,8 +1,8 @@
 { callPackage }:
-callPackage ./generic.nix {} rec {
+callPackage ./generic.nix { } rec {
   pname = "signal-desktop";
   dir = "Signal";
-  version = "6.45.0";
+  version = "7.5.1";
   url = "https://updates.signal.org/desktop/signal-desktop-mac-x64-${version}.dmg";
-  hash = "sha256-M8DPh7/aenqFX4vvQaSAY0QXfTXwejvHd5gh0KxY4eI=";
+  hash = "sha256-3GFGiMWYQSQX1EQPYPWikr+0iAo36KZUjsTGkR9MQdA=";
 }
diff --git a/...sengers/signal-desktop/signal-desktop.nix → ...l-desktop/signal-desktop-x86_64-linux.nix b/...sengers/signal-desktop/signal-desktop.nix → ...l-desktop/signal-desktop-x86_64-linux.nix
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh
@@ -18,19 +18,19 @@ signal-desktop)
   echo "Updating signal-desktop for x86_64-linux"
   nix-update --version "$latestVersion" \
     --system x86_64-linux \
-    --override-filename "$SCRIPT_DIR/signal-desktop.nix" \
+    --override-filename "$SCRIPT_DIR/signal-desktop-x86_64-linux.nix" \
     signal-desktop
 
   echo "Updating signal-desktop for aarch64-linux"
   nix-update --version "$latestVersionAarch64" \
     --system aarch64-linux \
-    --override-filename "$SCRIPT_DIR/signal-desktop-aarch64.nix" \
+    --override-filename "$SCRIPT_DIR/signal-desktop-aarch64-linux.nix" \
     signal-desktop
 
   echo "Updating signal-desktop for x86_64-darwin"
   nix-update --version "$latestVersion" \
     --system x86_64-darwin \
-    --override-filename "$SCRIPT_DIR/signal-desktop-darwin.nix" \
+    --override-filename "$SCRIPT_DIR/signal-desktop-x86_64-darwin.nix" \
     signal-desktop
 
   echo "Updating signal-desktop for aarch64-darwin"