Skip to content

discord: enable aarch64-darwin support for discord-canary #179379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Artturin merged 1 commit into from
Jul 17, 2022
Merged

discord: enable aarch64-darwin support for discord-canary #179379

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 49 additions & 46 deletions pkgs/applications/networking/instant-messengers/discord/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,42 +10,40 @@ let
canary = "0.0.283";
};
version = versions.${branch};
srcs = let
darwin-ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8=";
};
in {
srcs = rec {
x86_64-linux = {
stable = fetchurl {
url =
"https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
sha256 = "1hl01rf3l6kblx5v7rwnwms30iz8zw6dwlkjsx2f1iipljgkh5q4";
};
ptb = fetchurl {
url =
"https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc=";
};
canary = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "sha256-OrGg4jXziesHBhQORxREN/wq776RgNGaTyjJNV4pSAU=";
};
};
x86_64-darwin = {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p";
aarch64-darwin = {
ptb = fetchurl {
url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg";
sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8=";
};
ptb = darwin-ptb;
canary = fetchurl {
url =
"https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg";
sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l";
};
};
# Only PTB bundles a MachO Universal binary with ARM support.
aarch64-darwin = { ptb = darwin-ptb; };
# Stable does not (yet) provide aarch64-darwin support. PTB and Canary, however, do.
x86_64-darwin =
aarch64-darwin
// {
stable = fetchurl {
url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg";
sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p";
};
};
};
src = srcs.${stdenv.hostPlatform.system}.${branch};

Expand All @@ -57,35 +55,40 @@ let
license = licenses.unfree;
maintainers = with maintainers; [ ldesgoui MP2E devins2518 ];
platforms = [ "x86_64-linux" "x86_64-darwin" ]
++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ];
++ lib.optionals (branch != "stable") [ "aarch64-darwin" ];
};
package = if stdenv.isLinux then ./linux.nix else ./darwin.nix;
package =
if stdenv.isLinux
then ./linux.nix
else ./darwin.nix;

openasar = callPackage ./openasar.nix { };

packages = (builtins.mapAttrs
(_: value: callPackage package
(value // {
inherit src version openasar;
meta = meta // { mainProgram = value.binaryName; };
})
)
{
stable = rec {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
};
ptb = rec {
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
};
canary = rec {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
};
}
packages = (
builtins.mapAttrs
(_: value:
callPackage package (value
// {
inherit src version openasar;
meta = meta // { mainProgram = value.binaryName; };
}))
{
stable = rec {
pname = "discord";
binaryName = "Discord";
desktopName = "Discord";
};
ptb = rec {
pname = "discord-ptb";
binaryName = "DiscordPTB";
desktopName = "Discord PTB";
};
canary = rec {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
};
}
);
in packages.${branch}
in
packages.${branch}