From 13e3c0d7b98e6f03e2a1d907b05aa31dc4a4268e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Thu, 16 Jul 2009 15:39:05 +0000 Subject: [PATCH] JDEE: Don't install non-JAR files under `lib/java'. svn path=/nixpkgs/trunk/; revision=16403 --- .../applications/editors/emacs-modes/jdee/default.nix | 11 +++++++++++ .../editors/emacs-modes/jdee/java-directory.patch | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/jdee/default.nix b/pkgs/applications/editors/emacs-modes/jdee/default.nix index 5b7f009eacdf..039dc91dbaae 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/default.nix +++ b/pkgs/applications/editors/emacs-modes/jdee/default.nix @@ -50,6 +50,17 @@ in ensureDir "$out/share/${name}" cp -rv java/bsh-commands "$out/share/${name}" + + # Move everything that's not a JAR to $datadir. This includes + # `sun_checks.xml', license files, etc. + cd "$out/lib/java" + for i in * + do + if echo $i | grep -qv '\.jar''$' + then + mv -v "$i" "$out/share/${name}" + fi + done ''; buildInputs = [ emacs ant ]; diff --git a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch b/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch index 3b07246edcc8..53aa8edc6eaa 100644 --- a/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch +++ b/pkgs/applications/editors/emacs-modes/jdee/java-directory.patch @@ -53,7 +53,7 @@ Tell the elisp code about the right Java directory. (if jde-checkstyle-style (jde-normalize-path jde-checkstyle-style) - (concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml"))) -+ "@out@/lib/java/sun_checks.xml")) ++ "@datadir@/sun_checks.xml")) (if jde-checkstyle-expanded-properties-file (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file))) (if jde-checkstyle-module-package-names-file