Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4cc48e5e0f7c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dbdc5af9e814
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 12, 2020

  1. discord-canary: 0.0.103 -> 0.0.104 

    This update updates the necessary dependencies, and enables patchelf on
the binary in order to make it launch again.
    @rileyinman
    rileyinman authored and Cray Elliott committed Jun 12, 2020
    Copy the full SHA
    dbdc5af View commit details
Showing with 22 additions and 8 deletions.
  1. +20 −6 pkgs/applications/networking/instant-messengers/discord/base.nix
  2. +2 −2 pkgs/applications/networking/instant-messengers/discord/default.nix
26 changes: 20 additions & 6 deletions pkgs/applications/networking/instant-messengers/discord/base.nix
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,30 @@
{ pname, version, src, binaryName, desktopName
, stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
, autoPatchelfHook, fetchurl, makeDesktopItem, stdenv, wrapGAppsHook
, 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
, mesa, nspr, nss, pango, systemd
}:

let
inherit binaryName;
in stdenv.mkDerivation rec {
inherit pname version src;

nativeBuildInputs = [ wrapGAppsHook ];
nativeBuildInputs = [
alsaLib
autoPatchelfHook
cups
libdrm
libX11
libXScrnSaver
libXtst
libxcb
mesa.drivers
nss
wrapGAppsHook
];

dontWrapGApps = true;

4 changes: 2 additions & 2 deletions pkgs/applications/networking/instant-messengers/discord/default.nix
View file
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ in {
pname = "discord-canary";
binaryName = "DiscordCanary";
desktopName = "Discord Canary";
version = "0.0.103";
version = "0.0.104";
src = fetchurl {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "1d95q75ak4z6wkxlgcmkl7yk20gl7zf568b0xslz42hwx032fn4z";
sha256 = "17np1hqqygjlbmlln0d1ba2qlbjykwj156w5dw7g4lg77kfxicfk";
};
};
}.${branch}