public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

discord: minor clean up, add self to maintainers

Browse Source
This commit is contained in:
Cray Elliott
2017-08-08 22:29:45 -07:00
parent 6616b9a225
commit 3bda92175a
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/networking/instant-messengers/discord/default.nix
+9 -11
View File
@@ -25,24 +25,22 @@ stdenv.mkDerivation rec {
]; ];
installPhase = '' installPhase = ''
mkdir -p $out/{bin,share/pixmaps} mkdir -p $out/{bin,opt,share/pixmaps}
mv * $out mv * $out/opt
# 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:$libPath" \ --set-rpath "$out/opt:$libPath" \
$out/Discord $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/opt/Discord $out/bin/
ln -s $out/discord.png $out/share/pixmaps 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/ ln -s "${desktopItem}/share/applications" $out/share/
''; '';
@@ -60,7 +58,7 @@ stdenv.mkDerivation rec {
homepage = https://discordapp.com/; homepage = https://discordapp.com/;
downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; downloadPage = "https://github.com/crmarsh/discord-linux-bugs";
license = licenses.unfree; license = licenses.unfree;
maintainers = [ maintainers.ldesgoui ]; maintainers = [ maintainers.ldesgoui maintainers.MP2E ];
platforms = [ "x86_64-linux" ]; platforms = [ "x86_64-linux" ];
}; };
} }