diff options
| -rw-r--r-- | nixos/tests/riak.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/nosql/riak/2.1.1.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/riak.nix b/nixos/tests/riak.nix index a56f51c4e50e..f36d12bdb2cf 100644 --- a/nixos/tests/riak.nix +++ b/nixos/tests/riak.nix @@ -16,6 +16,6 @@ import ./make-test.nix { $master->waitForUnit("riak"); $master->sleep(20); # Hopefully this is long enough!! - $master->succeed("RIAK_DATA_DIR='/var/db/riak' RIAK_LOG_DIR='/var/log/riak' RIAK_ETC_DIR='/etc/riak' riak ping 2>&1"); + $master->succeed("riak ping 2>&1"); ''; } diff --git a/pkgs/servers/nosql/riak/2.1.1.nix b/pkgs/servers/nosql/riak/2.1.1.nix index 74cf03a1ca86..c62cea180be7 100644 --- a/pkgs/servers/nosql/riak/2.1.1.nix +++ b/pkgs/servers/nosql/riak/2.1.1.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { postPatch = '' sed -i deps/node_package/priv/base/env.sh \ - -e 's@{{platform_data_dir}}@$RIAK_DATA_DIR@' \ + -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak}@' \ -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ - -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=$RIAK_ETC_DIR@' \ - -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=$RIAK_LOG_DIR@' + -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak}@' \ + -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' ''; preBuild = '' |