diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-08-04 15:32:43 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-08-04 15:32:43 -0700 |
| commit | 926f073f55e7b662dcc26165465267c373c8d17e (patch) | |
| tree | 734d46d92e48777ef981179c628e3a03a81223fd /pkgs/servers/nosql | |
| parent | f6dfaee6f573f8224ec743b8a785713cc674f974 (diff) | |
| parent | 04f1b451d71cf16fd911e645afdaa381bbd861f0 (diff) | |
| download | nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.gz nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.bz2 nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.lz nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.xz nixlib-926f073f55e7b662dcc26165465267c373c8d17e.tar.zst nixlib-926f073f55e7b662dcc26165465267c373c8d17e.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'pkgs/servers/nosql')
| -rw-r--r-- | pkgs/servers/nosql/riak/2.1.1.nix | 6 |
1 files changed, 3 insertions, 3 deletions
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 = '' |