diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 1eba3442342..dbc4edf5167 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -5,61 +5,60 @@ , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: stdenv.mkDerivation rec { + pname = "discord"; + version = "0.0.9"; - pname = "discord"; - version = "0.0.9"; + src = fetchurl { + url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; + sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf"; + }; - src = fetchurl { - url = "https://cdn.discordapp.com/apps/linux/${version}/${pname}-${version}.tar.gz"; - sha256 = "1i0f8id10rh2fx381hx151qckvvh8hbznfsfav8w0dfbd1bransf"; - }; + nativeBuildInputs = [ wrapGAppsHook ]; - nativeBuildInputs = [ wrapGAppsHook ]; + dontWrapGApps = true; - dontWrapGApps = true; + libPath = stdenv.lib.makeLibraryPath [ + libcxx systemd libpulseaudio + stdenv.cc.cc alsaLib atk at-spi2-atk cairo cups dbus expat fontconfig freetype + gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender + libXtst nspr nss libxcb pango systemd libXScrnSaver + ]; - libPath = stdenv.lib.makeLibraryPath [ - libcxx systemd libpulseaudio - stdenv.cc.cc alsaLib atk at-spi2-atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid - libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender - libXtst nspr nss libxcb pango systemd libXScrnSaver - ]; + installPhase = '' + mkdir -p $out/{bin,opt/discord,share/pixmaps} + mv * $out/opt/discord - installPhase = '' - mkdir -p $out/{bin,opt/discord,share/pixmaps} - mv * $out/opt/discord + chmod +x $out/opt/discord/Discord + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + $out/opt/discord/Discord - chmod +x $out/opt/discord/Discord - patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ - $out/opt/discord/Discord + wrapProgram $out/opt/discord/Discord \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : ${libPath} - wrapProgram $out/opt/discord/Discord \ - "''${gappsWrapperArgs[@]}" \ - --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ - --prefix LD_LIBRARY_PATH : ${libPath} + ln -s $out/opt/discord/Discord $out/bin/ + ln -s $out/opt/discord/discord.png $out/share/pixmaps - ln -s $out/opt/discord/Discord $out/bin/ - ln -s $out/opt/discord/discord.png $out/share/pixmaps + ln -s "${desktopItem}/share/applications" $out/share/ + ''; - ln -s "${desktopItem}/share/applications" $out/share/ - ''; + desktopItem = makeDesktopItem { + name = pname; + exec = "Discord"; + icon = pname; + desktopName = "Discord"; + genericName = meta.description; + categories = "Network;InstantMessaging;"; + }; - desktopItem = makeDesktopItem { - name = pname; - exec = "Discord"; - icon = pname; - desktopName = "Discord"; - genericName = meta.description; - categories = "Network;InstantMessaging;"; - }; - - meta = with stdenv.lib; { - description = "All-in-one cross-platform voice and text chat for gamers"; - homepage = https://discordapp.com/; - downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; - license = licenses.unfree; - maintainers = [ maintainers.ldesgoui maintainers.MP2E ]; - platforms = [ "x86_64-linux" ]; - }; + meta = with stdenv.lib; { + description = "All-in-one cross-platform voice and text chat for gamers"; + homepage = https://discordapp.com/; + downloadPage = "https://github.com/crmarsh/discord-linux-bugs"; + license = licenses.unfree; + maintainers = [ maintainers.ldesgoui maintainers.MP2E ]; + platforms = [ "x86_64-linux" ]; + }; }