From df4a8eafde6e65406ac258787f83c25bc6363c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 7 Jul 2009 16:13:45 +0000 Subject: [PATCH] Add JDEE, the Java development environment for Emacs. svn path=/nixpkgs/trunk/; revision=16222 --- .../emacs-modes/jdee/cedet-paths.patch | 18 +++++ .../editors/emacs-modes/jdee/default.nix | 67 +++++++++++++++++++ .../emacs-modes/jdee/elib-avltree.patch | 15 +++++ .../jdee/installation-layout.patch | 19 ++++++ pkgs/top-level/all-packages.nix | 5 ++ 5 files changed, 124 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch create mode 100644 pkgs/applications/editors/emacs-modes/jdee/default.nix create mode 100644 pkgs/applications/editors/emacs-modes/jdee/elib-avltree.patch create mode 100644 pkgs/applications/editors/emacs-modes/jdee/installation-layout.patch diff --git a/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch b/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch new file mode 100644 index 00000000000..8c866e2d1db --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/jdee/cedet-paths.patch @@ -0,0 +1,18 @@ +JDE insists on seeing CEDET's source tree layout, with various +sub-directories (`common', `eieio', etc.). However, the installed CEDET +is flat, with everything under ${cedet}/share/emacs/site-lisp. + +--- jde/config/build.el (revision 90) ++++ jde/config/build.el (working copy) +@@ -50,10 +50,5 @@ PATHS are sub directories under CEDET-DI + (jde-make-autoloads-and-compile (expand-file-name "@{build.lisp.dir}") + "@{src.lisp.dir}" + "@{cedet.dir}" +- '("common" +- "eieio" +- "semantic" +- "semantic/bovine" +- "speedbar" +- ) ++ '(".") + "@{build.lisp.autoload.libname}") diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix new file mode 100644 index 00000000000..074655e3ba6 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -0,0 +1,67 @@ +{ fetchsvn, stdenv, emacs, cedet, ant }: + +let + revision = "90"; +in + stdenv.mkDerivation rec { + name = "jdee-svn${revision}"; + + # Last release is too old, so use SVN. + # See http://www.emacswiki.org/emacs/JavaDevelopmentEnvironment . + src = fetchsvn { + # Looks like they're not sure whether to put one or two `e'... + url = "https://jdee.svn.sourceforge.net/svnroot/jdee/trunk/jde"; + rev = revision; + sha256 = "06q1956yrs4r83a6sf3fk915jhsmg1q84wrrgjbdccfv5akid435"; + }; + + patches = [ + ./installation-layout.patch ./cedet-paths.patch ./elib-avltree.patch + ]; + + configurePhase = '' + ensureDir "dist" + cat > build.properties < + +- + +- +- +- +- + + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fbe0ba518a..37f48efbe3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -891,6 +891,11 @@ let inherit fetchurl stdenv; }; + jdee = import ../applications/editors/emacs-modes/jdee { + inherit fetchsvn stdenv cedet ant; + emacs = emacs23; # for `avl-tree' + }; + jdiskreport = import ../tools/misc/jdiskreport { inherit fetchurl stdenv unzip jdk; };