From be5208856b61c551a8936502cd1b1af9b8226da3 Mon Sep 17 00:00:00 2001
From: xenofem <xenofem@xeno.science>
Date: Sun, 23 Apr 2023 02:19:19 -0400
Subject: [PATCH] Revert "fix mpv global config dir"

This reverts commit 6f73a7d50c9d0377f4210a81db304231882b4ab8.
---
 confdir.patch | 13 -------------
 flake.nix     | 11 ++---------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 confdir.patch

diff --git a/confdir.patch b/confdir.patch
deleted file mode 100644
index 03b6be1..0000000
--- a/confdir.patch
+++ /dev/null
@@ -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)
diff --git a/flake.nix b/flake.nix
index 7c780cf..204716e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -46,15 +46,8 @@
     packages // rec {
       overlays.default = final: prev: let
         newScripts = packages.packages.${prev.system};
-      in rec {
-        mpv-unwrapped = prev.mpv-unwrapped.overrideAttrs (oldAttrs: {
-          patches = (oldAttrs.patches or []) ++ [
-            ./confdir.patch
-          ];
-        });
-        mpv = prev.wrapMpv mpv-unwrapped {
-          scripts = builtins.attrValues newScripts;
-        };
+      in {
+        mpv = prev.mpv.override { scripts = builtins.attrValues newScripts; };
         mpvScripts = prev.mpvScripts // newScripts;
       };