diff options
| author | Cray Elliott <MP2E@archlinux.us> | 2019-01-16 17:33:07 -0800 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2019-01-16 17:34:24 -0800 |
| commit | ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49 (patch) | |
| tree | 1e4c6dd264f56be610d448af39dbac4f4cc1d59e /pkgs/applications/networking/instant-messengers/discord | |
| parent | 3704524a3610eaae7e8477638a0bb2f354b73828 (diff) | |
| download | nixlib-ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49.tar nixlib-ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49.tar.gz nixlib-ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49.tar.bz2 nixlib-ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49.tar.lz nixlib-ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49.tar.xz nixlib-ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49.tar.zst nixlib-ff2341afc9a10e4e59a7b62d31d93bc73b7d2e49.zip | |
discord: fix gsettings crash when selecting file
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/discord')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/default.nix | 11 |
1 files 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 d2caccd4da27..2f563cc07a85 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 |