discord: clean up /opt, put discord in its own dir

This commit is contained in:
Cray Elliott 2017-08-26 16:09:05 -07:00
parent f0fc3101d5
commit bff106ea60

View File

@ -25,21 +25,21 @@ stdenv.mkDerivation rec {
]; ];
installPhase = '' installPhase = ''
mkdir -p $out/{bin,opt,share/pixmaps} mkdir -p $out/{bin,opt/discord,share/pixmaps}
mv * $out/opt mv * $out/opt/discord
# Copying how adobe-reader does it, # Copying how adobe-reader does it,
# see pkgs/applications/misc/adobe-reader/builder.sh # see pkgs/applications/misc/adobe-reader/builder.sh
patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
--set-rpath "$out/opt:$libPath" \ --set-rpath "$out/opt/discord:$libPath" \
$out/opt/Discord $out/opt/discord/Discord
paxmark m $out/opt/Discord paxmark m $out/opt/discord/Discord
wrapProgram $out/opt/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib" wrapProgram $out/opt/discord/Discord --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH:${libcxx}/lib:${systemd.lib}/lib:${libpulseaudio}/lib"
ln -s $out/opt/Discord $out/bin/ ln -s $out/opt/discord/Discord $out/bin/
ln -s $out/opt/discord.png $out/share/pixmaps ln -s $out/opt/discord/discord.png $out/share/pixmaps
ln -s "${desktopItem}/share/applications" $out/share/ ln -s "${desktopItem}/share/applications" $out/share/
''; '';