diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop')
6 files changed, 92 insertions, 25 deletions
diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c545ac79a242..364843e7bfa8 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,12 +1,6 @@ -{ callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { - signal-desktop = { - dir = "Signal"; - version = "6.40.0"; - hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; - }; - signal-desktop-beta = { - dir = "Signal Beta"; - version = "6.40.0-beta.2"; - hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; - }; +{ hostPlatform, callPackage }: { + signal-desktop = if hostPlatform.system == "aarch64-linux" + then callPackage ./signal-desktop-aarch64.nix { } + else callPackage ./signal-desktop.nix { }; + signal-desktop-beta = callPackage ./signal-desktop-beta.nix{ }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix index 1d75bd542d6c..68c5552b251c 100644 --- a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/generic.nix @@ -1,8 +1,4 @@ -{ pname -, dir -, version -, hash -, stdenv +{ stdenv , lib , fetchurl , autoPatchelfHook @@ -51,8 +47,20 @@ , wayland }: -stdenv.mkDerivation rec { - inherit pname version; # Please backport all updates to the stable channel. +{ pname +, dir +, version +, hash +, url +}: + +let + inherit (stdenv) targetPlatform; + ARCH = if targetPlatform.isAarch64 then "arm64" else "x64"; +in stdenv.mkDerivation rec { + inherit pname version; + + # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -61,8 +69,7 @@ stdenv.mkDerivation rec { # few additional steps and might not be the best idea.) src = fetchurl { - url = "https://updates.signal.org/desktop/apt/pool/s/${pname}/${pname}_${version}_amd64.deb"; - inherit hash; + inherit url hash; }; nativeBuildInputs = [ @@ -163,11 +170,14 @@ stdenv.mkDerivation rec { ${if pname == "signal-desktop" then "--replace \"bin/signal-desktop\" \"bin/signal-desktop --use-tray-icon\"" else ""} autoPatchelf --no-recurse -- "$out/lib/${dir}/" - patchelf --add-needed ${libpulseaudio}/lib/libpulse.so "$out/lib/${dir}/resources/app.asar.unpacked/node_modules/@signalapp/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-${ARCH}.node" ''; - # Tests if the application launches and waits for "Link your phone to Signal Desktop": - passthru.tests.application-launch = nixosTests.signal-desktop; + passthru = { + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + tests.application-launch = nixosTests.signal-desktop; + updateScript.command = [ ./update.sh ]; + }; meta = { description = "Private, simple, and secure messenger"; @@ -178,9 +188,9 @@ stdenv.mkDerivation rec { homepage = "https://signal.org/"; changelog = "https://github.com/signalapp/Signal-Desktop/releases/tag/v${version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ mic92 equirosa urandom ]; + maintainers = with lib.maintainers; [ mic92 equirosa urandom bkchr ]; mainProgram = pname; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix new file mode 100644 index 000000000000..d69571928af8 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-aarch64.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix { } rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.40.0"; + url = "https://github.com/0mniteck/Signal-Desktop-Mobian/raw/${version}/builds/release/signal-desktop_${version}_arm64.deb"; + hash = "sha256-3Pi0c+CGcJR1M4ll51m+B5PmGIcIjjlc0qa9b8rkMeU="; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix new file mode 100644 index 000000000000..9b99f67e156a --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop-beta"; + dir = "Signal Beta"; + version = "6.40.0-beta.2"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; + hash = "sha256-pfedkxbZ25DFgz+/N7ZEb9LwKrHuoMM+Zi+Tc21QPsg="; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix new file mode 100644 index 000000000000..bfae729772f4 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -0,0 +1,8 @@ +{ callPackage }: +callPackage ./generic.nix {} rec { + pname = "signal-desktop"; + dir = "Signal"; + version = "6.40.0"; + url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; + hash = "sha256-vyXHlycPSyEyv938IKzGM6pdERHHerx2CLY/U+WMrH4="; +} diff --git a/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh new file mode 100755 index 000000000000..37c0f33d12f7 --- /dev/null +++ b/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update curl coreutils jq + +set -ex + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" + +curl_github() { + curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} "$@" +} + +case "$UPDATE_NIX_ATTR_PATH" in +signal-desktop) + latestTag=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases/latest | jq -r ".tag_name") + latestVersion="$(expr "$latestTag" : 'v\(.*\)')" + latestVersionAarch64=$(curl_github "https://api.github.com/repos/0mniteck/Signal-Desktop-Mobian/releases/latest" | jq -r ".tag_name") + + echo "Updating signal-desktop for x86_64-linux" + nix-update --version "$latestVersion" \ + --system x86_64-linux \ + --override-filename "$SCRIPT_DIR/signal-desktop.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" \ + signal-desktop + ;; +signal-desktop-beta) + latestTagBeta=$(curl_github https://api.github.com/repos/signalapp/Signal-Desktop/releases | jq -r ".[0].tag_name") + latestVersionBeta="$(expr "$latestTagBeta" : 'v\(.*\)')" + echo "Updating signal-desktop-beta for x86_64-linux" + nix-update --version "$latestVersionBeta" --system x86_64-linux --override-filename "$SCRIPT_DIR/signal-desktop-beta.nix" signal-desktop-beta + ;; +*) + echo "Unknown attr path $UPDATE_NIX_ATTR_PATH" + ;; +esac |