diff options
author | Cray Elliott <MP2E@archlinux.us> | 2017-08-08 22:29:19 -0700 |
---|---|---|
committer | Cray Elliott <MP2E@archlinux.us> | 2017-08-08 22:29:45 -0700 |
commit | 3bda92175a7d466facdad03869d33139cabbadd0 (patch) | |
tree | 020e949e146abb010caa7836c9e2652d1e8c4d1d /pkgs/applications/networking/instant-messengers/discord | |
parent | 6616b9a2255545b42831275b8b44ce6845d1330f (diff) |
discord: minor clean up, add self to maintainers
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/discord')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/discord/default.nix | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index dab68440b877e..f787f3f26e927 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -25,24 +25,22 @@ stdenv.mkDerivation rec { ]; installPhase = '' - mkdir -p $out/{bin,share/pixmaps} - mv * $out + mkdir -p $out/{bin,opt,share/pixmaps} + mv * $out/opt # 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:$libPath" \ - $out/Discord + --set-rpath "$out/opt:$libPath" \ + $out/opt/Discord - paxmark m $out/Discord + paxmark m $out/opt/Discord - wrapProgram $out/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib" + wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib" - ln -s $out/Discord $out/bin/ - ln -s $out/discord.png $out/share/pixmaps + ln -s $out/opt/Discord $out/bin/ + ln -s $out/opt/discord.png $out/share/pixmaps - # Putting udev in the path won't work :( - ln -s ${systemd.lib}/lib/libudev.so.1 $out ln -s "${desktopItem}/share/applications" $out/share/ ''; @@ -60,7 +58,7 @@ stdenv.mkDerivation rec { homepage = https://discordapp.com/; downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; license = licenses.unfree; - maintainers = [ maintainers.ldesgoui ]; + maintainers = [ maintainers.ldesgoui maintainers.MP2E ]; platforms = [ "x86_64-linux" ]; }; } |