diff options
| author | Danny Wilson <danny@prime.vc> | 2013-02-08 15:19:33 +0100 |
|---|---|---|
| committer | Danny Wilson <danny@onlinetouch.nl> | 2013-09-02 12:20:16 +0200 |
| commit | d6a812332ce42f34a39618d36cc85b96d5e70d08 (patch) | |
| tree | 139ae0a748a175485ff9ad05a87c27a6d785bfb9 /pkgs/development/libraries/java/jzmq/default.nix | |
| parent | 04a232f28b1f22b01da157f8d09e2f56fafa1cbc (diff) | |
| download | nixpkgs-d6a812332ce42f34a39618d36cc85b96d5e70d08.tar nixpkgs-d6a812332ce42f34a39618d36cc85b96d5e70d08.tar.gz nixpkgs-d6a812332ce42f34a39618d36cc85b96d5e70d08.tar.bz2 nixpkgs-d6a812332ce42f34a39618d36cc85b96d5e70d08.tar.lz nixpkgs-d6a812332ce42f34a39618d36cc85b96d5e70d08.tar.xz nixpkgs-d6a812332ce42f34a39618d36cc85b96d5e70d08.tar.zst nixpkgs-d6a812332ce42f34a39618d36cc85b96d5e70d08.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries/java/jzmq/default.nix')
| -rw-r--r-- | pkgs/development/libraries/java/jzmq/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/libraries/java/jzmq/default.nix b/pkgs/development/libraries/java/jzmq/default.nix index 9130e02e1d7..6208090ad51 100644 --- a/pkgs/development/libraries/java/jzmq/default.nix +++ b/pkgs/development/libraries/java/jzmq/default.nix @@ -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 ]; |