pyrox.dev / nixpkgs
lol
fork atom

eclipse: run with the jdk, not the jre

This is necessary so that tools like native2ascii are available to
maven eclipse integration (m2e).

authored by Matt McHenry and committed by Robert Helgesson 98a04844 d18a8904

+3 -3
unified split
+2 -2
pkgs/applications/editors/eclipse/build-eclipse.nix
··· 1 - { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jre, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: 1 + { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: 2 2 3 3 { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: 4 4 ··· 35 35 productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct) 36 36 37 37 makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ 38 - --prefix PATH : ${jre}/bin \ 38 + --prefix PATH : ${jdk}/bin \ 39 39 --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ 40 40 --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" 41 41
+1 -1
pkgs/applications/editors/eclipse/default.nix
··· 1 1 { stdenv, fetchurl, makeDesktopItem, makeWrapper 2 2 , freetype, fontconfig, libX11, libXext, libXrender, zlib 3 - , glib, gtk, libXtst, jre 3 + , glib, gtk, libXtst, jdk 4 4 , webkitgtk2 ? null # for internal web browser 5 5 , buildEnv, writeText, runCommand 6 6 , callPackage