summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-05-25 13:22:50 -0700
committerShea Levy <shea@shealevy.com>2021-06-01 07:34:28 -0400
commita1d551b23b2cdefe3909ef5287f2a67d8a54a930 (patch)
tree7ef8b4792c214097f7cdef5696a51a2261fe3b2c
parentdiscord: 0.0.14 -> 0.0.15 (diff)
downloadnixpkgs-a1d551b23b2cdefe3909ef5287f2a67d8a54a930.tar.gz
discord: fix runtime linking
(cherry picked from commit c5bed409b29dfbf467a71fab9679cf189ccfa428)
-rw-r--r--pkgs/applications/networking/instant-messengers/discord/base.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix
index 841c979e97f9..a61ab254348b 100644
--- a/pkgs/applications/networking/instant-messengers/discord/base.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/base.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
libXScrnSaver
libXtst
libxcb
- mesa.drivers
+ mesa
nss
wrapGAppsHook
];
@@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
dontWrapGApps = true;
libPath = lib.makeLibraryPath [
- libcxx systemd libpulseaudio
+ libcxx systemd libpulseaudio libdrm mesa
stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
@@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/opt/${binaryName}/${binaryName} \
"''${gappsWrapperArgs[@]}" \
--prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \
- --prefix LD_LIBRARY_PATH : ${libPath}
+ --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName}
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png