diff options
| author | Matt McHenry <github@matt.mchenryfamily.org> | 2016-02-04 15:15:48 -0500 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2016-02-27 13:40:38 +0100 |
| commit | 98a0484471a481408f1d189b7055ab77e7626649 (patch) | |
| tree | 3323a7fde0a428084a8598900000753b2e6cec7f /pkgs/applications/editors | |
| parent | d18a8904c0f4a0b915fd72798a0a14c108fa279c (diff) | |
| download | nixlib-98a0484471a481408f1d189b7055ab77e7626649.tar nixlib-98a0484471a481408f1d189b7055ab77e7626649.tar.gz nixlib-98a0484471a481408f1d189b7055ab77e7626649.tar.bz2 nixlib-98a0484471a481408f1d189b7055ab77e7626649.tar.lz nixlib-98a0484471a481408f1d189b7055ab77e7626649.tar.xz nixlib-98a0484471a481408f1d189b7055ab77e7626649.tar.zst nixlib-98a0484471a481408f1d189b7055ab77e7626649.zip | |
eclipse: run with the jdk, not the jre
This is necessary so that tools like native2ascii are available to maven eclipse integration (m2e).
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/eclipse/build-eclipse.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/editors/eclipse/default.nix | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 558c9fa3de5f..074a622667fa 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jre, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct) makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ - --prefix PATH : ${jre}/bin \ + --prefix PATH : ${jdk}/bin \ --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 815e092c9d5b..62271998060f 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk, libXtst, jre +, glib, gtk, libXtst, jdk , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage |