summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2021-06-08 17:08:54 +0200
committerGitHub <noreply@github.com>2021-06-08 17:08:54 +0200
commit3d04c4066f84c40bcc32746c735308d58b7e04b8 (patch)
tree7ec05e717f96b5371ac63b438568e8f92dbd4e84
parentrPackages.lwgeom: fix build (diff)
parentdiscord-canary: 0.0.123 -> 0.0.124 (diff)
downloadnixpkgs-3d04c4066f84c40bcc32746c735308d58b7e04b8.tar.gz
Merge pull request #125899 from NixOS/backport-125717-to-release-21.05
-rw-r--r--pkgs/applications/networking/instant-messengers/discord/base.nix3
-rw-r--r--pkgs/applications/networking/instant-messengers/discord/default.nix4
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix
index a61ab254348b..110d3ffb00ee 100644
--- a/pkgs/applications/networking/instant-messengers/discord/base.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/base.nix
@@ -3,7 +3,7 @@
, alsaLib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig
, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid
, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
-, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb
+, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence
, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu
}:
@@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
libXScrnSaver
libXtst
libxcb
+ libxshmfence
mesa
nss
wrapGAppsHook
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
index 0d75b3747922..e486cd9de62a 100644
--- a/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
- version = "0.0.123";
+ version = "0.0.124";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
- sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";
+ sha256 = "060ypr9rn5yl8iwh4v3ax1v6501yaq72sx50q47sm0wyxn7gpv91";
};
};
}.${branch}