discord: fix runtime linking

launchpad/nixpkgs/master
Jonathan Ringer 3 years ago committed by Jonathan Ringer
parent 4f6b97f2ac
commit c5bed409b2
  1. 6
      pkgs/applications/networking/instant-messengers/discord/base.nix

@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
libXScrnSaver libXScrnSaver
libXtst libXtst
libxcb libxcb
mesa.drivers mesa
nss nss
wrapGAppsHook wrapGAppsHook
]; ];
@ -31,7 +31,7 @@ in stdenv.mkDerivation rec {
dontWrapGApps = true; dontWrapGApps = true;
libPath = lib.makeLibraryPath [ 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 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 gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
@ -50,7 +50,7 @@ in stdenv.mkDerivation rec {
wrapProgram $out/opt/${binaryName}/${binaryName} \ wrapProgram $out/opt/${binaryName}/${binaryName} \
"''${gappsWrapperArgs[@]}" \ "''${gappsWrapperArgs[@]}" \
--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} --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${binaryName}
ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ ln -s $out/opt/${binaryName}/${binaryName} $out/bin/
ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png ln -s $out/opt/${binaryName}/discord.png $out/share/pixmaps/${pname}.png

Loading…
Cancel
Save