about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Ringer <jonringer117@gmail.com>2021-05-25 13:22:50 -0700
committerJonathan Ringer <jonringer@users.noreply.github.com>2021-05-25 21:55:15 -0700
commitc5bed409b29dfbf467a71fab9679cf189ccfa428 (patch)
treed5b9ac04401c551d55f781a15c9186ac4de1e7b1
parent4f6b97f2ac8c41a45b2672af6aac9dc48ec75f25 (diff)
downloadnixlib-c5bed409b29dfbf467a71fab9679cf189ccfa428.tar
nixlib-c5bed409b29dfbf467a71fab9679cf189ccfa428.tar.gz
nixlib-c5bed409b29dfbf467a71fab9679cf189ccfa428.tar.bz2
nixlib-c5bed409b29dfbf467a71fab9679cf189ccfa428.tar.lz
nixlib-c5bed409b29dfbf467a71fab9679cf189ccfa428.tar.xz
nixlib-c5bed409b29dfbf467a71fab9679cf189ccfa428.tar.zst
nixlib-c5bed409b29dfbf467a71fab9679cf189ccfa428.zip
discord: fix runtime linking
-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