diff options
| author | Qyriad <qyriad@qyriad.me> | 2024-04-09 02:03:24 -0600 |
|---|---|---|
| committer | Qyriad <qyriad@qyriad.me> | 2024-04-09 02:25:58 -0600 |
| commit | 4b99f43aeb34f4b27ed5d8090b8822bee3365f2b (patch) | |
| tree | 529950823018e4ac5b5850f34919de4fa107c787 /scripts | |
| parent | 2a98fe28cb18b117e4eabc8a3e237bf2606d9a51 (diff) | |
meson: correctly differentiate $profiledir and $sysconfdir/profile.d
The configured sysconfdir is used to look for nix.conf, so it needs
to be /etc, and not $out/etc, so we separate out the place where shell
profile files are installed, which is the only other place sysconfdir is
at all used.
See https://git.lix.systems/lix-project/lix/issues/231#issuecomment-1989
for more info.
Change-Id: Idbed8ba82e711b8a9d6b6127904befa27d58e279
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/meson.build b/scripts/meson.build index 5bfda71cf..c916c8efa 100644 --- a/scripts/meson.build +++ b/scripts/meson.build @@ -20,7 +20,7 @@ foreach rc : [ '.sh', '.fish', '-daemon.sh', '-daemon.fish' ] input : 'nix-profile' + rc + '.in', output : 'nix' + rc, install : true, - install_dir : sysconfdir / 'profile.d', + install_dir : profile_dir, install_mode : 'rw-r--r--', configuration : { 'localstatedir': state_dir, |