better overriding of conf dir
This commit is contained in:
parent
2c2216b8f4
commit
00f5e1d285
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index acaa39f764..b4efc581dc 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -1625,7 +1625,7 @@ sys.stdout.write(features)
|
|
||||||
'''
|
|
||||||
feature_str = run_command(python, '-c', feature_sort, feature_keys, check: true).stdout()
|
|
||||||
conf_data.set_quoted('FULLCONFIG', feature_str)
|
|
||||||
-conf_data.set_quoted('MPV_CONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir'), 'mpv'))
|
|
||||||
+conf_data.set_quoted('MPV_CONFDIR', '/etc/mpv')
|
|
||||||
configure_file(output : 'config.h', configuration : conf_data)
|
|
||||||
message('List of enabled features: ' + feature_str)
|
|
||||||
|
|
|
@ -48,8 +48,8 @@
|
||||||
newScripts = packages.packages.${prev.system};
|
newScripts = packages.packages.${prev.system};
|
||||||
in rec {
|
in rec {
|
||||||
mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (oldAttrs: {
|
mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (oldAttrs: {
|
||||||
patches = (oldAttrs.patches or []) ++ [
|
wafConfigureFlags = oldAttrs.wafConfigureFlags ++ [
|
||||||
./confdir.patch
|
"--confloaddir=/etc/mpv"
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
mpv = prev.wrapMpv mpv-unwrapped {
|
mpv = prev.wrapMpv mpv-unwrapped {
|
||||||
|
|
Loading…
Reference in a new issue