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;