From 4f950c6af98bc61ddc0bfb84bab68fa2c2c467e0 Mon Sep 17 00:00:00 2001 From: xenofem Date: Sun, 23 Apr 2023 02:19:15 -0400 Subject: [PATCH] Revert "better overriding of conf dir" This reverts commit 00f5e1d2859ab524b5c44672141b02282bdd9db6. --- confdir.patch | 13 +++++++++++++ flake.nix | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 confdir.patch diff --git a/confdir.patch b/confdir.patch new file mode 100644 index 0000000..d43c6a1 --- /dev/null +++ b/confdir.patch @@ -0,0 +1,13 @@ +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) + diff --git a/flake.nix b/flake.nix index 6b34069..7c780cf 100644 --- a/flake.nix +++ b/flake.nix @@ -48,8 +48,8 @@ newScripts = packages.packages.${prev.system}; in rec { mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (oldAttrs: { - wafConfigureFlags = oldAttrs.wafConfigureFlags ++ [ - "--confloaddir=/etc/mpv" + patches = (oldAttrs.patches or []) ++ [ + ./confdir.patch ]; }); mpv = prev.wrapMpv mpv-unwrapped {