From 4b99f43aeb34f4b27ed5d8090b8822bee3365f2b Mon Sep 17 00:00:00 2001 From: Qyriad Date: Tue, 9 Apr 2024 02:03:24 -0600 Subject: 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 --- meson.options | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meson.options') diff --git a/meson.options b/meson.options index 393d61c49..c71ec18ae 100644 --- a/meson.options +++ b/meson.options @@ -50,3 +50,8 @@ option('log-dir', type : 'string', value : '/nix/var/log', option('enable-docs', type : 'boolean', value : true, description : 'whether to build documentation', ) + +# A relative path means it gets appended to prefix. +option('profile-dir', type : 'string', value : 'etc/profile.d', + description : 'the path to install shell profile files', +) -- cgit v1.2.3