* Removed a lot of old Eclipse versions.

* Cleaned up the Eclipse classic expression a bit (e.g. use
  makeWrapper).  Also fall back to GTK 2.16 to fix some GUI glitches.

svn path=/nixpkgs/trunk/; revision=18485

10 files changed, 0 insertions, 210 deletions

diff --git a/pkgs/applications/editors/eclipse/build_with_jdk_compiler b/pkgs/applications/editors/eclipse/build_with_jdk_compiler
deleted file mode 100644
index bac6fc035f1..00000000000
--- a/pkgs/applications/editors/eclipse/build_with_jdk_compiler
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/build.xml	2008-03-02 14:34:05.000000000 +0100
-+++ b/build.xml	2008-03-02 14:34:57.000000000 +0100
-@@ -291,19 +291,6 @@
- 		</condition>
- 		<property name="bootclasspath" refid="default.bootclasspath" />
- 
--		<!--set the compiler and compiler arguments-->
--		<!--the default compiler is set to the one used by eclipse rel. eng. -->
--		<condition property="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter">
--			<available file="${basedir}/ecj.jar" />
--		</condition>
--		<fail message="The Eclipse compiler (ecj.jar) cannot be found.">
--			<condition>
--				<not>
--					<equals arg1="${build.compiler}" arg2="org.eclipse.jdt.core.JDTCompilerAdapter" />
--				</not>
--			</condition>
--		</fail>
--
- 		<property name="compilerArg" value="-enableJavadoc -encoding ISO-8859-1" />
- 		<property name="javacSource" value="1.6" />
- 		<property name="javacTarget" value="1.6" />
diff --git a/pkgs/applications/editors/eclipse/builder.sh b/pkgs/applications/editors/eclipse/builder.sh
deleted file mode 100755
index 5aa7f1f0dc0..00000000000
--- a/pkgs/applications/editors/eclipse/builder.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-source $stdenv/setup
-
-unpackFile $src 
-ensureDir $out
-mv eclipse $out/
-
-# Set the dynamic linker and RPATH.
-rpath=
-for i in $libraries; do
-    rpath=$rpath${rpath:+:}$i/lib
-done
-find $out \( -type f -a -perm +0100 \) \
-    -print \
-    -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \
-    --set-rpath "$rpath" {} \;
-
-# Make a wrapper script so that the proper JDK is found.
-# don't use makeWrapper in order to change the last line.
-
-ensureDir $out/bin
-cat >> $out/bin/eclipse << EOF
-#! /bin/sh -e
-export PATH=${jdk}/bin\${PATH:+:}\$PATH
-export LD_LIBRARY_PATH=$rpath\${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH
-exec \$(dirname \$0)/../eclipse/eclipse $@
-EOF
-chmod +x $out/bin/eclipse
-
-ensureDir plugin-working-dir
-workingdir="$(pwd)/plugin-working-dir"
-for plugin in $plugins; do
-    if test -e $plugin/install; then
-      cd $workingdir
-      $plugin/install "$out/eclipse"
-      rm -rf $workingdir/*
-    else
-      # assume that it is a file
-      cp $plugin $out/eclipse/plugins
-    fi
-done
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
deleted file mode 100644
index 97b582075c4..00000000000
--- a/pkgs/applications/editors/eclipse/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# recommended installation:
-# nix-build -A eclipsesdk
-# then cp -r $store-path ~/my-eclipse; chmod -R 777 ~/my-eclipse # ugh! I'm to lazy to assign permissions properly
-# maybe also using a wrapper such as this (lower values should suffice for most needs)
-#  eclipseWrapper () {
-#     "$@" -vmargs -Xms2048m -Xmx2048m -XX:MaxPermSize=2048m
-# }
-#
-# Why use a local copy? This way it's easier to use the update manager to get plugins :-)
-
-
-{fetchurl, stdenv, jdk, gtk, glib, libXtst, makeOverridable, plugins ? [], unzip}:
-
-let eclipseFun = 
-  makeOverridable ({name, bindist} :
-    stdenv.mkDerivation {
-      inherit name;
-      builder = ./builder.sh;
-      src = bindist;
-      buildInputs = [ unzip /* unzip required by eclipseCDT */ ];
-      inherit jdk plugins;
-      libraries = [gtk glib libXtst];
-   }); in
-
-  eclipseFun {
-    # you can override these settings usnig .override {...} 
-    name = "eclipse-sdk-3.5M6";
-
-    bindist = 
-      if (stdenv.system == "x86_64-linux") then fetchurl {
-        url = ftp://sunsite.informatik.rwth-aachen.de/pub/mirror/eclipse/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk-x86_64.tar.gz;
-        sha256 = "10p4idp5rcdf7xqwfk3kvmjxhi8x1v835m0y4pn9q4nhfb5643pi";
-      } else fetchurl {
-        url = ftp://mirror.micromata.de/eclipse/eclipse/downloads/drops/S-3.5M6-200903130100/eclipse-SDK-3.5M6-linux-gtk.tar.gz;
-        sha256 = "1z8j26b632ydhqrmwgbcqgiq7f1a542jam06z2h62mcbqazrcyah";
-      };
-  }
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix
deleted file mode 100644
index e9e336a8199..00000000000
--- a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst, plugins ? []}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.1.2";
-      builder = ./builder.sh;
-      src = bindist;
-      inherit makeWrapper jdk plugins;
-      libraries = [gtk glib libXtst];
-   };
-
-  bindist = 
-    fetchurl {
-      url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-SDK-3.1.2-linux-gtk.tar.gz;
-      md5 = "ece50ed4d6d48dac839bfe8fa719fcff";
-    };
-}
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
deleted file mode 100644
index 0627d5d13e8..00000000000
--- a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.1";
-      builder = ./builder.sh;
-      src = bindist;
-      inherit makeWrapper jdk;
-      libraries = [gtk glib libXtst];
-   };
-
-  bindist = 
-    fetchurl {
-      url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1-200506271435/eclipse-SDK-3.1-linux-gtk.tar.gz;
-      md5 = "0441c11cc5af1e84ed3be322929899e8";
-    };
-}
diff --git a/pkgs/applications/editors/eclipse/plugins/installers/builder.sh b/pkgs/applications/editors/eclipse/plugins/installers/builder.sh
deleted file mode 100644
index 8c00f1e2270..00000000000
--- a/pkgs/applications/editors/eclipse/plugins/installers/builder.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-source $stdenv/setup
-
-ensureDir $out
-cat >> $out/install <<EOF
-#! /bin/sh
-
-PLUGIN=$plugin
-UNZIP=$unzip/bin/unzip
-ECLIPSE=\$1
-
-\$UNZIP \$PLUGIN
-
-if test -e plugins; then
-  cp -prd * \$ECLIPSE
-else
-  cd *
-  cp -prd * \$ECLIPSE
-fi
-EOF
-
-chmod u+x $out/install
diff --git a/pkgs/applications/editors/eclipse/plugins/installers/zip.nix b/pkgs/applications/editors/eclipse/plugins/installers/zip.nix
deleted file mode 100644
index e8ccb12b1a3..00000000000
--- a/pkgs/applications/editors/eclipse/plugins/installers/zip.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{stdenv, unzip, plugin}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-zip-plugin-installer";
-      builder = ./builder.sh;
-      inherit plugin unzip;
-   };
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
deleted file mode 100644
index 3d61fbbe809..00000000000
--- a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.0.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{stdenv, fetchurl}:
-
-fetchurl {
-  url = http://www.ii.uib.no/~karltk/spoofax/plugins/org.spoofax.editor_0.3.0.jar;
-  md5 = "ff66d229c774f840ec8285f64c0f95bc";
-}
diff --git a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix
deleted file mode 100644
index 59fe53c3736..00000000000
--- a/pkgs/applications/editors/eclipse/plugins/spoofax/0.3.10.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{stdenv, fetchurl}:
-
-fetchurl {
-  url = http://nixos.org/tarballs/org.spoofax.editor_0.3.10.jar;
-  md5 = "ff77853e750e19a9b8d380c17ea27f3d";
-}
diff --git a/pkgs/applications/editors/eclipse/runner.nix b/pkgs/applications/editors/eclipse/runner.nix
deleted file mode 100644
index dccc7b5376f..00000000000
--- a/pkgs/applications/editors/eclipse/runner.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-args: with args;
-stdenv.mkDerivation {
-  name = "nix-eclipse-runner-script";
-
-  phases = "installPhase";
-  installPhase = ''
-    ensureDir $out/bin
-    target=$out/bin/nix-run-eclipse
-    cat > $target << EOF
-    #!/bin/sh
-    export PATH=${jre}/bin:$PATH
-    export LD_LIBRARY_PATH=${glib}/lib:${gtk}/lib:${libXtst}/lib
-    # If you run out of XX space try these? -vmargs -Xms512m -Xmx2048m -XX:MaxPermSize=256m
-    exec "\$@"
-    EOF
-    chmod +x $target
-  '';
-
-  meta = { 
-    description = "provide environment to run Eclipse";
-    longDescription = ''
-      Is there one distribution providing support for up to date Eclipse installations?
-      There are various reasons why not.
-      Installing binaries just works. Get Eclipse binaries form eclipse.org/downloads
-      install this wrapper then run Eclipse like this:
-      nix-run-eclipse $PATH_TO_ECLIPSE/eclipse/eclipse
-      and be happy. Everything works including update sites.
-    '';
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
-  };
-}