git.iko.soy/typeable/nixpkgs
on master help sign in
discord-{ptb,canary}: init; add `update-discord`
commite6f23b8b1eebf83d8c63582845c74bee3a54a4b5 authorTadeo Kondrak <me@tadeo.ca> dateTue 18 Jun 2019, 23:39 (7 years ago) parent0687a9d
4 files changed+144−62
maintainers/scripts/update-discord+36 pkgs/applications/networking/instant-messengers/discord/base.nix+61 pkgs/applications/networking/instant-messengers/discord/default.nix+33−61 pkgs/top-level/all-packages.nix+14−1
maintainers/scripts/update-discordnew file+36
@@ -0,0 +1,36 @@
1+#!/usr/bin/env bash
2+# script to generate `pkgs/networking/instant-messengers/discord/default.nix`
3+
4+set -e
5+exec >${1:?usage: $0 <output-file>}
6+
7+cat <<EOF
8+{ branch ? "stable", pkgs }:
9+
10+let
11+ inherit (pkgs) callPackage fetchurl;
12+in {
13+EOF
14+
15+for branch in "" ptb canary; do
16+ url=$(curl -sI "https://discordapp.com/api/download${branch:+/}${branch}?platform=linux&format=tar.gz" | grep -oP 'location: \K\S+')
17+ version=${url##https://dl*.discordapp.net/apps/linux/}
18+ version=${version%%/*.tar.gz}
19+ echo " ${branch:-stable} = callPackage ./base.nix {"
20+ echo " pname = \"discord${branch:+-}${branch}\";"
21+ case $branch in
22+ "") suffix="" ;;
23+ ptb) suffix="PTB" ;;
24+ canary) suffix="Canary" ;;
25+ esac
26+ echo " binaryName = \"Discord${suffix}\";"
27+ echo " desktopName = \"Discord${suffix:+ }${suffix}\";"
28+ echo " version = \"${version}\";"
29+ echo " src = fetchurl {"
30+ echo " url = \"${url}\";"
31+ echo " sha256 = \"$(nix-prefetch-url "$url")\";"
32+ echo " };"
33+ echo " };"
34+done
35+
36+echo "}.\${branch}"
pkgs/applications/networking/instant-messengers/discord/base.nixnew file+61
@@ -0,0 +1,61 @@
1+{ pname, version, src, binaryName, desktopName
2+, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
3+, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
4+, gdk_pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
5+, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
6+, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
7+
8+let
9+ inherit binaryName;
10+in stdenv.mkDerivation rec {
11+ inherit pname version src;
12+
13+ nativeBuildInputs = [ wrapGAppsHook ];
14+
15+ dontWrapGApps = true;
16+
17+ libPath = stdenv.lib.makeLibraryPath [
18+ libcxx systemd libpulseaudio
19+ stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
20+ gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
21+ libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
22+ libXtst nspr nss libxcb pango systemd libXScrnSaver
23+ ];
24+
25+ installPhase = ''
26+ mkdir -p $out/{bin,opt/${binaryName},share/pixmaps}
27+ mv * $out/opt/${binaryName}
28+
29+ chmod +x $out/opt/${binaryName}/${binaryName}
30+ patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
31+ $out/opt/${binaryName}/${binaryName}
32+
33+ wrapProgram $out/opt/${binaryName}/${binaryName} \
34+ "''${gappsWrapperArgs[@]}" \
35+ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
36+ --prefix LD_LIBRARY_PATH : ${libPath}
37+
38+ ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
39+ ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${binaryName}.png
40+
41+ ln -s "${desktopItem}/share/applications" $out/share/
42+ '';
43+
44+ desktopItem = makeDesktopItem {
45+ name = pname;
46+ exec = binaryName;
47+ icon = pname;
48+ inherit desktopName;
49+ genericName = meta.description;
50+ categories = "Network;InstantMessaging;";
51+ };
52+
53+ meta = with stdenv.lib; {
54+ description = "All-in-one cross-platform voice and text chat for gamers";
55+ homepage = "https://discordapp.com/";
56+ downloadPage = "https://discordapp.com/download";
57+ license = licenses.unfree;
58+ maintainers = with maintainers; [ ldesgoui MP2E tadeokondrak ];
59+ platforms = [ "x86_64-linux" ];
60+ };
61+}
pkgs/applications/networking/instant-messengers/discord/default.nix+33−61
@@ -1,64 +1,36 @@
1−{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
2−, alsaLib, atk, at-spi2-atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
3−, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
4−, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
5−, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
6−
7−stdenv.mkDerivation rec {
8− pname = "discord";
9− version = "0.0.9";
10−
11− src = fetchurl {
12− url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz";
13− sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf";
14− };
15−
16− nativeBuildInputs = [ wrapGAppsHook ];
17−
18− dontWrapGApps = true;
19−
20− libPath = stdenv.lib.makeLibraryPath [
21− libcxx systemd libpulseaudio
22− stdenv.cc.cc alsaLib atk at-spi2-atk cairo cups dbus expat fontconfig freetype
23− gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
24− libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
25− libXtst nspr nss libxcb pango systemd libXScrnSaver
26− ];
27−
28− installPhase = ''
29− mkdir -p $out/{bin,opt/discord,share/pixmaps}
30− mv * $out/opt/discord
31−
32− chmod +x $out/opt/discord/Discord
33− patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \
34− $out/opt/discord/Discord
35−
36− wrapProgram $out/opt/discord/Discord \
37− "''${gappsWrapperArgs[@]}" \
38− --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
39− --prefix LD_LIBRARY_PATH : ${libPath}
40−
41− ln -s $out/opt/discord/Discord $out/bin/
42− ln -s $out/opt/discord/discord.png $out/share/pixmaps
43−
44− ln -s "${desktopItem}/share/applications" $out/share/
45− '';
46−
47− desktopItem = makeDesktopItem {
48− name = pname;
49− exec = "Discord";
50− icon = pname;
1+{ branch ? "stable", pkgs }:
2+
3+let
4+ inherit (pkgs) callPackage fetchurl;
5+in {
6+ stable = callPackage ./base.nix {
7+ pname = "discord";
8+ binaryName = "Discord";
519 desktopName = "Discord";
52− genericName = meta.description;
53− categories = "Network;InstantMessaging;";
10+ version = "0.0.9";
11+ src = fetchurl {
12+ url = "https://dl.discordapp.net/apps/linux/0.0.9/discord-0.0.9.tar.gz";
13+ sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf";
14+ };
5415 };
55−
56− meta = with stdenv.lib; {
57− description = "All-in-one cross-platform voice and text chat for gamers";
58− homepage = https://discordapp.com/;
59− downloadPage = "https://github.com/crmarsh/discord-linux-bugs";
60− license = licenses.unfree;
61− maintainers = [ maintainers.ldesgoui maintainers.MP2E ];
62− platforms = [ "x86_64-linux" ];
16+ ptb = callPackage ./base.nix {
17+ pname = "discord-ptb";
18+ binaryName = "DiscordPTB";
19+ desktopName = "Discord PTB";
20+ version = "0.0.15";
21+ src = fetchurl {
22+ url = "https://dl-ptb.discordapp.net/apps/linux/0.0.15/discord-ptb-0.0.15.tar.gz";
23+ sha256 = "0znqb0a3yglgx7a9ypkb81jcm8kqgc6559zi7vfqn02zh15gqv6a";
24+ };
25+ };
26+ canary = callPackage ./base.nix {
27+ pname = "discord-canary";
28+ binaryName = "DiscordCanary";
29+ desktopName = "Discord Canary";
30+ version = "0.0.83";
31+ src = fetchurl {
32+ url = "https://dl-canary.discordapp.net/apps/linux/0.0.83/discord-canary-0.0.83.tar.gz";
33+ sha256 = "100a61x71cgyfm0xk4qdlbp1v41089jy7lajksbpy4y7him6bg2s";
34+ };
6335 };
64−}
36+}.${branch}
pkgs/top-level/all-packages.nix+14−1
@@ -24135,7 +24135,20 @@ in
2413524135
2413624136 togglesg-download = callPackage ../tools/misc/togglesg-download { };
2413724137
24138− discord = callPackage ../applications/networking/instant-messengers/discord { };
24138+ discord = import ../applications/networking/instant-messengers/discord {
24139+ branch = "stable";
24140+ inherit pkgs;
24141+ };
24142+
24143+ discord-ptb = import ../applications/networking/instant-messengers/discord {
24144+ branch = "ptb";
24145+ inherit pkgs;
24146+ };
24147+
24148+ discord-canary = import ../applications/networking/instant-messengers/discord {
24149+ branch = "canary";
24150+ inherit pkgs;
24151+ };
2413924152
2414024153 golden-cheetah = libsForQt56.callPackage ../applications/misc/golden-cheetah {};
2414124154