Merge pull request #202352 from fufexan/discord
This commit is contained in:
commit
09faac41c4
|
@ -1,7 +1,7 @@
|
||||||
{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook
|
{ pname, version, src, openasar, meta, binaryName, desktopName, autoPatchelfHook
|
||||||
, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk
|
, makeDesktopItem, lib, stdenv, wrapGAppsHook, makeShellWrapper, alsa-lib, at-spi2-atk
|
||||||
, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf
|
, 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
|
, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
|
||||||
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
|
, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
|
||||||
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
|
, pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
|
||||||
|
@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
|
||||||
gdk-pixbuf
|
gdk-pixbuf
|
||||||
glib
|
glib
|
||||||
gtk3
|
gtk3
|
||||||
|
libglvnd
|
||||||
libnotify
|
libnotify
|
||||||
libX11
|
libX11
|
||||||
libXcomposite
|
libXcomposite
|
||||||
|
@ -96,7 +97,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
wrapProgramShell $out/opt/${binaryName}/${binaryName} \
|
wrapProgramShell $out/opt/${binaryName}/${binaryName} \
|
||||||
"''${gappsWrapperArgs[@]}" \
|
"''${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 XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
|
||||||
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
|
--prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName} \
|
||||||
--run "${lib.getExe disableBreakingUpdates}"
|
--run "${lib.getExe disableBreakingUpdates}"
|
||||||
|
|
Loading…
Reference in a new issue