From a76438ccab516263636b82b2d9a70d55595738ed Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 15 Jan 2019 11:23:36 -0800 Subject: [PATCH 1/4] discord: 0.0.5 -> 0.0.7 discord now depends on gtk3 instead of gtk2, unfortunately there is no public changelog, so other changes are unknown (cherry picked from commit 4e4a9babd75edc2ec0f94175535ddb8c9c6a2447) --- .../instant-messengers/discord/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 09ead9b3de6540..5a36d396691349 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,26 +1,26 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf -, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage +, alsaLib, atk, at-spi2-atk, 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 }: stdenv.mkDerivation rec { pname = "discord"; - version = "0.0.5"; + version = "0.0.7"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "067gb72qsxrzfma04njkbqbmsvwnnyhw4k9igg5769jkxay68i1g"; + sha256 = "1jjlwbx80vwhc8il48lb4sqzdb8zdwg28d8vnxsvhcqylfhwf8d8"; }; nativeBuildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ libcxx systemd libpulseaudio - stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite + stdenv.cc.cc alsaLib atk at-spi2-atk cairo cups dbus expat fontconfig freetype + gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss libxcb pango systemd libXScrnSaver ]; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,opt/discord,share/pixmaps} mv * $out/opt/discord + chmod +x $out/opt/discord/Discord patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/discord/Discord From 01f54e8fd8d50f57edc016855a6f8eac91df91c7 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 15 Jan 2019 17:39:28 -0800 Subject: [PATCH 2/4] discord: 0.0.7 -> 0.0.8 also fixes evaluation on release-18.09 (cherry picked from commit d5d5453684b06b89bc8d45f956cde3f381b463c6) --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 5a36d396691349..2d6481a5e5a3bb 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.7"; + version = "0.0.8"; name = "${pname}-${version}"; src = fetchurl { url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1jjlwbx80vwhc8il48lb4sqzdb8zdwg28d8vnxsvhcqylfhwf8d8"; + sha256 = "1p786ma54baljs0bw8nl9sr37ypbpjblcndxsw4djgyxkd9ii16r"; }; nativeBuildInputs = [ makeWrapper ]; From c2eb7d73c1efec906a8f002d24f4e50b1835e47e Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 15 Jan 2019 17:50:40 -0800 Subject: [PATCH 3/4] discord: remove line referencing paxmark --- .../networking/instant-messengers/discord/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 2d6481a5e5a3bb..d2caccd4da27a9 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/discord/Discord - paxmark m $out/opt/discord/Discord - wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : ${libPath} ln -s $out/opt/discord/Discord $out/bin/ From 8a00a453cea0b5ff29ffe46eb6a3ddfd53abe388 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Wed, 16 Jan 2019 17:33:07 -0800 Subject: [PATCH 4/4] discord: fix gsettings crash when selecting file (cherry picked from commit ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49) --- .../networking/instant-messengers/discord/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index d2caccd4da27a9..2f563cc07a8594 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeDesktopItem, makeWrapper +{ stdenv, fetchurl, makeDesktopItem, wrapGAppsHook , alsaLib, atk, at-spi2-atk, 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 @@ -15,7 +15,9 @@ stdenv.mkDerivation rec { sha256 = "1p786ma54baljs0bw8nl9sr37ypbpjblcndxsw4djgyxkd9ii16r"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ wrapGAppsHook ]; + + dontWrapGApps = true; libPath = stdenv.lib.makeLibraryPath [ libcxx systemd libpulseaudio @@ -33,7 +35,10 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/discord/Discord - wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : ${libPath} + wrapProgram $out/opt/discord/Discord \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : ${libPath} ln -s $out/opt/discord/Discord $out/bin/ ln -s $out/opt/discord/discord.png $out/share/pixmaps