slack: aarch64 darwin support and updater

This commit is contained in:
Hlöðver Sigurðsson 2022-02-06 22:12:10 +02:00
parent bd076da1d2
commit 5facd430d4
2 changed files with 28 additions and 21 deletions

View File

@ -56,28 +56,27 @@ let
version = { version = {
x86_64-darwin = x86_64-darwin-version; x86_64-darwin = x86_64-darwin-version;
aarch64-darwin = aarch64-darwin-version;
x86_64-linux = x86_64-linux-version; x86_64-linux = x86_64-linux-version;
aarch64-darwin = aarch64-darwin-version;
}.${system} or throwSystem; }.${system} or throwSystem;
src =
let src = let
base = "https://downloads.slack-edge.com"; base = "https://downloads.slack-edge.com";
in in {
{ x86_64-darwin = fetchurl {
x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg";
url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; sha256 = x86_64-darwin-sha256;
sha256 = x86_64-darwin-sha256; };
}; x86_64-linux = fetchurl {
aarch64-darwin = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb";
url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg"; sha256 = x86_64-linux-sha256;
sha256 = aarch64-darwin-sha256; };
}; aarch64-darwin = fetchurl {
x86_64-linux = fetchurl { url = "${base}/releases/macos/${version}/prod/arm64/Slack-${version}-macOS.dmg";
url = "${base}/releases/linux/${version}/prod/x64/slack-desktop-${version}-amd64.deb"; sha256 = aarch64-darwin-sha256;
sha256 = x86_64-linux-sha256; };
}; }.${system} or throwSystem;
}.${system} or throwSystem;
meta = with lib; { meta = with lib; {
description = "Desktop client for Slack"; description = "Desktop client for Slack";
@ -195,7 +194,10 @@ let
runHook preInstall runHook preInstall
mkdir -p $out/Applications/Slack.app mkdir -p $out/Applications/Slack.app
cp -R . $out/Applications/Slack.app cp -R . $out/Applications/Slack.app
/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -bool YES '' + lib.optionalString (!stdenv.isAarch64) ''
# on aarch64-darwin we get: Could not write domain com.tinyspeck.slackmacgap; exiting
/usr/bin/defaults write com.tinyspeck.slackmacgap SlackNoAutoUpdates -Bool YES
'' + ''
runHook postInstall runHook postInstall
''; '';
}; };

View File

@ -16,6 +16,7 @@ nixpkgs="$(git rev-parse --show-toplevel)"
slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix"
nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p')
nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
nixpkgs_mac_arm_version=$(cat "$slack_nix" | sed -n 's/.*aarch64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p')
if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then
echo "nixpkgs versions are all up to date!" echo "nixpkgs versions are all up to date!"
@ -24,13 +25,17 @@ fi
linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb" linux_url="https://downloads.slack-edge.com/releases/linux/${latest_linux_version}/prod/x64/slack-desktop-${latest_linux_version}-amd64.deb"
mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg"
mac_arm_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/arm64/Slack-${latest_mac_version}-macOS.dmg"
linux_sha256=$(nix-prefetch-url ${linux_url}) linux_sha256=$(nix-prefetch-url ${linux_url})
mac_sha256=$(nix-prefetch-url ${mac_url}) mac_sha256=$(nix-prefetch-url ${mac_url})
mac_arm_sha256=$(nix-prefetch-url ${mac_arm_url})
sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix" sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix"
sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
sed -i "s/aarch64-darwin-version = \".*\"/aarch64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix"
sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix" sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix"
sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
sed -i "s/aarch64-darwin-sha256 = \".*\"/aarch64-darwin-sha256 = \"${mac_arm_sha256}\"/" "$slack_nix"
if ! nix-build -A slack "$nixpkgs"; then if ! nix-build -A slack "$nixpkgs"; then
echo "The updated slack failed to build." echo "The updated slack failed to build."