Revert "fix mpv global config dir"

This reverts commit 6f73a7d50c.
This commit is contained in:
xenofem 2023-04-23 02:19:19 -04:00
parent 681260bdb6
commit be5208856b
2 changed files with 2 additions and 22 deletions

View file

@ -1,13 +0,0 @@
diff --git a/meson.build b/meson.build
index 4aada48731..39a37853de 100644
--- a/meson.build
+++ b/meson.build
@@ -1655,7 +1655,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')
conf_data.set_quoted('PLATFORM', host_machine.system())
configure_file(output : 'config.h', configuration : conf_data)
message('List of enabled features: ' + feature_str)

View file

@ -46,15 +46,8 @@
packages // rec { packages // rec {
overlays.default = final: prev: let overlays.default = final: prev: let
newScripts = packages.packages.${prev.system}; newScripts = packages.packages.${prev.system};
in rec { in {
mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (oldAttrs: { mpv = prev.mpv.override { scripts = builtins.attrValues newScripts; };
patches = (oldAttrs.patches or []) ++ [
./confdir.patch
];
});
mpv = prev.wrapMpv mpv-unwrapped {
scripts = builtins.attrValues newScripts;
};
mpvScripts = prev.mpvScripts // newScripts; mpvScripts = prev.mpvScripts // newScripts;
}; };