diff options
| author | eldritch horrors <pennae@lix.systems> | 2024-03-29 16:48:41 +0100 |
|---|---|---|
| committer | eldritch horrors <pennae@lix.systems> | 2024-03-29 19:14:23 +0000 |
| commit | 1da1f501fcf9384e9cc15405b041f3dd9bb2a51a (patch) | |
| tree | f4fd6d146b5d789a9cc19294c0300eecd8c6ca0b | |
| parent | 6646b803964cc60a25723ac92cf97d4e828a83c3 (diff) | |
meson: fix state-dir default value
the autoconf build system defaults to /nix/var, not /nix/var/nix. the
latter is only used in libstore, so we'll move the extra segment there.
Change-Id: Idfbc988ee302355982abdcd51d6d7b5d5d661c0d
| -rw-r--r-- | meson.options | 2 | ||||
| -rw-r--r-- | src/libstore/meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meson.options b/meson.options index ef5a669dd..022727858 100644 --- a/meson.options +++ b/meson.options @@ -39,7 +39,7 @@ option('store-dir', type : 'string', value : '/nix/store', description : 'path of the Nix store', ) -option('state-dir', type : 'string', value : '/nix/var/nix', +option('state-dir', type : 'string', value : '/nix/var', description : 'path to store state in for Nix', ) diff --git a/src/libstore/meson.build b/src/libstore/meson.build index 7e1c8d548..3fa9f52b7 100644 --- a/src/libstore/meson.build +++ b/src/libstore/meson.build @@ -149,7 +149,7 @@ cpp_str_defines = { 'NIX_PREFIX': prefix, 'NIX_STORE_DIR': store_dir, 'NIX_DATA_DIR': datadir, - 'NIX_STATE_DIR': state_dir, + 'NIX_STATE_DIR': state_dir / 'nix', 'NIX_LOG_DIR': log_dir, 'NIX_CONF_DIR': sysconfdir, 'NIX_BIN_DIR': bindir, |