diff options
| author | Will Dietz <w@wdtz.org> | 2018-01-09 13:21:39 -0600 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2018-01-10 22:12:06 -0800 |
| commit | 8753b10808338c52d59dc5f2f74fb9c089ab134c (patch) | |
| tree | f8c10369658e4babd77271b14b89f70a800a36fb /pkgs/applications/networking | |
| parent | 15b143243537217fa2a7788cd5838889f207826d (diff) | |
| download | nixlib-8753b10808338c52d59dc5f2f74fb9c089ab134c.tar nixlib-8753b10808338c52d59dc5f2f74fb9c089ab134c.tar.gz nixlib-8753b10808338c52d59dc5f2f74fb9c089ab134c.tar.bz2 nixlib-8753b10808338c52d59dc5f2f74fb9c089ab134c.tar.lz nixlib-8753b10808338c52d59dc5f2f74fb9c089ab134c.tar.xz nixlib-8753b10808338c52d59dc5f2f74fb9c089ab134c.tar.zst nixlib-8753b10808338c52d59dc5f2f74fb9c089ab134c.zip | |
discord: fix "corrupt install" warnings, misc cleanup
Few things: * Discord binary has RUNPATH not RPATH set * patchelf uses RUNPATH if it already exits, so deps end up in RUNPATH * RUNPATH isn't searched for plugins or transitive deps * ..badness results Despite this, it currently seems to work-- with the caveat that it has a little bar on top complaining about how "it looks like your installation is corrupt". This fixes that warning and does some minor cleanup.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 5ccdd887c8eb..76d688802636 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; libPath = stdenv.lib.makeLibraryPath [ + libcxx systemd libpulseaudio stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender @@ -28,15 +29,12 @@ stdenv.mkDerivation rec { mkdir -p $out/{bin,opt/discord,share/pixmaps} mv * $out/opt/discord - # Copying how adobe-reader does it, - # see pkgs/applications/misc/adobe-reader/builder.sh - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/discord:$libPath" \ + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ $out/opt/discord/Discord paxmark m $out/opt/discord/Discord - wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib" + wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : ${libPath} ln -s $out/opt/discord/Discord $out/bin/ ln -s $out/opt/discord/discord.png $out/share/pixmaps |