From 2f367e0af714bb6e7abcd3b79d7bd31bd946a3d3 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Wed, 18 Jan 2017 22:25:14 -0800 Subject: [PATCH] discord: 0.0.13 -> 0.0.1 Despite the version number confusion, this is a new version of discord-canary, but since the build is now public/official, the version number has been reset and the canary suffix has been dropped. Note that this means that the executable has been renamed from DiscordCanary to Discord --- .../instant-messengers/discord/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1d1ae151caa..4085324a2aa 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.13"; + version = "0.0.1"; name = "${pname}-${version}"; src = fetchurl { - url = "https://cdn-canary.discordapp.com/apps/linux/${version}/${pname}-canary-${version}.tar.gz"; - sha256 = "1pwb8y80z1bmfln5wd1vrhras0xygd1j15sib0g9vaig4mc55cs6"; + url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; + sha256 = "10m3ixvhmxdw55awd84gx13m222qjykj7gcigbjabcvsgp2z63xs"; }; libPath = stdenv.lib.makeLibraryPath [ @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { # see pkgs/applications/misc/adobe-reader/builder.sh patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out:$libPath" \ - $out/DiscordCanary + $out/Discord - paxmark m $out/DiscordCanary + paxmark m $out/Discord - ln -s $out/DiscordCanary $out/bin/ + ln -s $out/Discord $out/bin/ ln -s $out/discord.png $out/share/pixmaps # Putting udev in the path won't work :( @@ -44,9 +44,9 @@ stdenv.mkDerivation rec { desktopItem = makeDesktopItem { name = pname; - exec = "DiscordCanary"; + exec = "Discord"; icon = pname; - desktopName = "Discord Canary"; + desktopName = "Discord"; genericName = meta.description; categories = "Network;InstantMessaging;"; };