refactor(overlays): limit autoconf-archive patch to cava pkg

zakuciael · Dec 2, 2024 · fac9fc1 · fac9fc1
1 parent e5f8519
commit fac9fc1
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/overlays/autoconf-archive/default.nix b/overlays/autoconf-archive/default.nix
diff --git a/...check_gl.m4-properly-quote-m4_fatal.patch → ...check_gl.m4-properly-quote-m4_fatal.patch b/...check_gl.m4-properly-quote-m4_fatal.patch → ...check_gl.m4-properly-quote-m4_fatal.patch
diff --git a/...heck_glx.m4-properly-quote-m4_fatal.patch → ...heck_glx.m4-properly-quote-m4_fatal.patch b/...heck_glx.m4-properly-quote-m4_fatal.patch → ...heck_glx.m4-properly-quote-m4_fatal.patch
diff --git a/...ch_flags.m4-properly-quote-m4_fatal.patch → ...ch_flags.m4-properly-quote-m4_fatal.patch b/...ch_flags.m4-properly-quote-m4_fatal.patch → ...ch_flags.m4-properly-quote-m4_fatal.patch
diff --git a/overlays/cava/default.nix b/overlays/cava/default.nix
@@ -0,0 +1,22 @@
+{lib, ...}:
+with lib;
+  singleton (final: prev: {
+    # TODO: Remove when https://github.com/NixOS/nixpkgs/pull/355948 is merged into unstable branch
+    cava = prev.cava.overrideAttrs (prevAttrs: {
+      nativeBuildInputs = with prev; [
+        autoreconfHook
+        pkgconf
+        versionCheckHook
+        (autoconf-archive.overrideAttrs {
+          patches = [
+            # cherry-picked changes from
+            # https://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=commit;h=fadde164479a926d6b56dd693ded2a4c36ed89f0
+            # can be removed on next release
+            ./0001-ax_check_gl.m4-properly-quote-m4_fatal.patch
+            ./0002-ax_check_glx.m4-properly-quote-m4_fatal.patch
+            ./0003-ax_switch_flags.m4-properly-quote-m4_fatal.patch
+          ];
+        })
+      ];
+    });
+  })