diff --git a/pkgs/applications/editors/eclipse/builder.sh b/pkgs/applications/editors/eclipse/builder.sh index 8d693b025ff..b38befee41a 100755 --- a/pkgs/applications/editors/eclipse/builder.sh +++ b/pkgs/applications/editors/eclipse/builder.sh @@ -5,14 +5,6 @@ unpackFile $src ensureDir $out mv eclipse $out/ -# Unpack the jars that contain .so files. -#echo "unpacking some jars..." -#for i in $(find $out -name "*.linux*.jar"); do -# echo $i -# cd $(dirname $i) && $jdk/bin/jar -x < $i -# rm $i -#done - # Set the dynamic linker and RPATH. rpath= for i in $libraries; do @@ -22,9 +14,6 @@ find $out \( -type f -a -perm +0100 \) \ -print \ -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; -#find $out \( -type f -a -name "*.so*" \) \ -# -print \ -# -exec patchelf --set-rpath "$rpath" {} \; # Make a wrapper script so that the proper JDK is found. makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 1542328ee84..3664a09c1fa 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1 +1,20 @@ -import ./eclipse-sdk-3.1.2.nix \ No newline at end of file +{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst, plugins ? []}: + +let { + body = + stdenv.mkDerivation { + name = "eclipse-sdk-3.2.2"; + builder = ./builder.sh; + src = bindist; + inherit makeWrapper jdk plugins; + libraries = [gtk glib libXtst]; + }; + + bindist = + fetchurl { + url = http://ftp-stud.fht-esslingen.de/pub/Mirrors/eclipse/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-SDK-3.2.2-linux-gtk.tar.gz; + sha256 = "0slrx8l75k91v8hqr2rvh6x0a2xdplza8gm1dc39bhyaq2gx9sdx"; + }; +} + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f61bcd35c5..81a3a58b4c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2603,6 +2603,8 @@ rec { inherit plugins; }; + eclipsesdk = eclipse []; + eclipseSpoofax = eclipse [spoofax]; diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix index 212b64532a4..bc8278fb16e 100644 --- a/pkgs/top-level/build-for-release.nix +++ b/pkgs/top-level/build-for-release.nix @@ -41,6 +41,7 @@ let { docbook5_xsl e2fsprogs ecj + eclipsesdk emacs emacsUnicode enscript