* eclipse-sdk: added support for plugins

* Added Spoofax editor plugin.

* re-added eclipse-sdk 3.1, which wasn't necessary after all.


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

6 files changed, 52 insertions, 18 deletions

diff --git a/pkgs/applications/editors/eclipse/builder.sh b/pkgs/applications/editors/eclipse/builder.sh
index 330263b46583..a40692a55997 100755
--- a/pkgs/applications/editors/eclipse/builder.sh
+++ b/pkgs/applications/editors/eclipse/builder.sh
@@ -31,3 +31,7 @@ find $out \( -type f -a -perm +0100 \) \
 makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
     --prefix PATH ":" "$jdk/bin" \
     --prefix LD_LIBRARY_PATH ":" "$rpath"
+
+for i in $plugins; do
+    cp $i $out/eclipse/plugins
+done
\ No newline at end of file
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index d9f5e0302588..17e4c6b3b1e3 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,18 +1 @@
-{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.1.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.1-200509290840/eclipse-SDK-3.1.1-linux-gtk.tar.gz;
-      md5 = "a2ae61431657e2ed247867b9a9948290";
-    };
-}
+import ./eclipse-sdk-3.1.1.nix
\ No newline at end of file
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix
new file mode 100644
index 000000000000..8c1558daf255
--- /dev/null
+++ b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix
@@ -0,0 +1,18 @@
+{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst, plugins ? []}:
+
+let {
+  body =
+    stdenv.mkDerivation {
+      name = "eclipse-sdk-3.1.1";
+      builder = ./builder.sh;
+      src = bindist;
+      inherit makeWrapper jdk plugins;
+      libraries = [gtk glib libXtst];
+   };
+
+  bindist = 
+    fetchurl {
+      url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.1-200509290840/eclipse-SDK-3.1.1-linux-gtk.tar.gz;
+      md5 = "a2ae61431657e2ed247867b9a9948290";
+    };
+}
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
new file mode 100644
index 000000000000..0627d5d13e81
--- /dev/null
+++ b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.nix
@@ -0,0 +1,18 @@
+{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/spoofax/default.nix b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
new file mode 100644
index 000000000000..3d61fbbe809e
--- /dev/null
+++ b/pkgs/applications/editors/eclipse/plugins/spoofax/default.nix
@@ -0,0 +1,6 @@
+{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/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index e57cbed3db9f..bc091628ca79 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -1696,6 +1696,11 @@ rec {
     inherit fetchurl stdenv makeWrapper jdk;
     inherit (gtkLibs) gtk glib;
     inherit (xlibs) libXtst;
+    plugins = [spoofax];
+  };
+
+  spoofax = (import ../applications/editors/eclipse/plugins/spoofax) {
+    inherit fetchurl stdenv;
   };
 
   monodevelop = (import ../applications/editors/monodevelop) {