summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-12-13 01:04:12 +0100
committerGitHub <noreply@github.com>2022-12-13 01:04:12 +0100
commit09faac41c45bfacb8e3380cb5a63bff1306ccedb (patch)
tree96b64e058b0af8ea8d73eab47c9b7f3c691c601e
parentMerge pull request #205412 from muscaln/discord (diff)
parentdiscord: add libglvnd and fix electron flags (diff)
downloadnixpkgs-09faac41c45bfacb8e3380cb5a63bff1306ccedb.tar.gz
Merge pull request #202352 from fufexan/discord
-rw-r--r--pkgs/applications/networking/instant-messengers/discord/linux.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix
index 0b246125ffe7..6d955128cb12 100644
--- a/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -1,7 +1,7 @@
{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook
, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk
, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
-, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid, libX11
+, glib, gtk3, libcxx, libdrm, libglvnd, libnotify, libpulseaudio, libuuid, libX11
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
gdk-pixbuf
glib
gtk3
+ libglvnd
libnotify
libX11
libXcomposite
@@ -96,7 +97,7 @@ stdenv.mkDerivation rec {
wrapProgramShell $out/opt/${binaryName}/${binaryName} \
"''${gappsWrapperArgs[@]}" \
- --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations}}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
--run "${lib.getExe disableBreakingUpdates}"