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/servers/computing | |
parent | 04a232f28b1f22b01da157f8d09e2f56fafa1cbc (diff) |
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/servers/computing')
-rw-r--r-- | pkgs/servers/computing/storm/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/servers/computing/storm/default.nix b/pkgs/servers/computing/storm/default.nix index 083ad5e64391..b60d9fe62b25 100644 --- a/pkgs/servers/computing/storm/default.nix +++ b/pkgs/servers/computing/storm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python}: +{ stdenv, fetchurl, unzip, jzmq, jdk, lib, python, logsDir, confDir }: stdenv.mkDerivation { name = "storm-0.8.2"; @@ -12,16 +12,18 @@ stdenv.mkDerivation { installPhase = '' # Remove junk rm -f lib/jzmq* - mkdir -p /var/log/storm + mkdir -p $out/bin mv bin/storm $out/bin/ - rm -R bin + rm -R bin conf logs # Fix shebang header for python scripts - sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" bin/storm; + sed -i -e "s|#!/usr/bin/.*python|#!${python}/bin/python|" $out/bin/storm; mkdir -p $out cp -av * $out - ln -s /var/log/storm $out/logs + cd $out; + ${if logsDir != "" then ''ln -s ${logsDir} logs'' else ""} + ${if confDir != "" then ''ln -s ${confDir} conf'' else ""} ''; dontStrip = true; |