Make Storm conf and log path configurable via symlinks.

- The bin/storm script makes too many assumptions about file locations and java classpath that I couldn't figure out a better way.

Fix jzmq build on NixOS: java source was treated as ASCII.
This commit is contained in:
Danny Wilson
2013-02-08 15:19:33 +01:00
committed by Danny Wilson
parent 04a232f28b
commit d6a812332c
3 changed files with 14 additions and 9 deletions

View File

@@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
buildInputs = [ automake autoconf libtool pkgconfig zeromq2 jdk ];
preConfigurePhases = ["./autogen.sh"];
preConfigure = if stdenv.system == "x86_64-darwin" then ''
sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
'' else "";
preConfigure = ''
sed -i -e 's|(JAVAC)|(JAVAC) -encoding utf8|' src/Makefile.in
${if stdenv.system == "x86_64-darwin" then
'' sed -i -e 's~/Headers~/include~' -e 's~_JNI_INC_SUBDIRS=\".*\"~_JNI_INC_SUBDIRS=\"darwin\"~' configure
'' else ""}
'';
maintainers = [ stdenv.lib.maintainers.blue ];