lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

meson: fix state-dir default value

Browse source 
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
This commit is contained in:
eldritch horrors 2024-03-29 16:48:41 +01:00
parent 6646b80396
commit 1da1f501fc
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.options
View file

@ -39,7 +39,7 @@ option('store-dir', type : 'string', value : '/nix/store',
description : 'path of the 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', description : 'path to store state in for Nix',
) )

2
src/libstore/meson.build
View file

@ -149,7 +149,7 @@ cpp_str_defines = {
'NIX_PREFIX': prefix, 'NIX_PREFIX': prefix,
'NIX_STORE_DIR': store_dir, 'NIX_STORE_DIR': store_dir,
'NIX_DATA_DIR': datadir, 'NIX_DATA_DIR': datadir,
'NIX_STATE_DIR': state_dir, 'NIX_STATE_DIR': state_dir / 'nix',
'NIX_LOG_DIR': log_dir, 'NIX_LOG_DIR': log_dir,
'NIX_CONF_DIR': sysconfdir, 'NIX_CONF_DIR': sysconfdir,
'NIX_BIN_DIR': bindir, 'NIX_BIN_DIR': bindir,