public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JDEE: Don't install non-JAR files under `lib/java'.

Browse Source 
svn path=/nixpkgs/trunk/; revision=16403
This commit is contained in:
Ludovic Courtès 2009-07-16 15:39:05 +00:00
parent 82c5ea7bc6
commit 13e3c0d7b9
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/applications/editors/emacs-modes/jdee/default.nix
View File

@ -50,6 +50,17 @@ in
ensureDir "$out/share/${name}" ensureDir "$out/share/${name}"
cp -rv java/bsh-commands "$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 ]; buildInputs = [ emacs ant ];

2
pkgs/applications/editors/emacs-modes/jdee/java-directory.patch
View File

@ -53,7 +53,7 @@ Tell the elisp code about the right Java directory.
(if jde-checkstyle-style (if jde-checkstyle-style
(jde-normalize-path jde-checkstyle-style) (jde-normalize-path jde-checkstyle-style)
- (concat (jde-find-jde-data-directory) "java/lib/sun_checks.xml"))) - (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 (if jde-checkstyle-expanded-properties-file
(list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file))) (list "-p" (jde-normalize-path jde-checkstyle-expanded-properties-file)))
(if jde-checkstyle-module-package-names-file (if jde-checkstyle-module-package-names-file