From fac9fc158791e752779e8e720759cb1b06dc65ee Mon Sep 17 00:00:00 2001 From: Krzysztof Saczuk Date: Mon, 2 Dec 2024 12:24:25 +0100 Subject: [PATCH] refactor(overlays): limit `autoconf-archive` patch to `cava` pkg --- overlays/autoconf-archive/default.nix | 15 ------------- ..._check_gl.m4-properly-quote-m4_fatal.patch | 0 ...check_glx.m4-properly-quote-m4_fatal.patch | 0 ...tch_flags.m4-properly-quote-m4_fatal.patch | 0 overlays/cava/default.nix | 22 +++++++++++++++++++ 5 files changed, 22 insertions(+), 15 deletions(-) delete mode 100644 overlays/autoconf-archive/default.nix rename overlays/{autoconf-archive => cava}/0001-ax_check_gl.m4-properly-quote-m4_fatal.patch (100%) rename overlays/{autoconf-archive => cava}/0002-ax_check_glx.m4-properly-quote-m4_fatal.patch (100%) rename overlays/{autoconf-archive => cava}/0003-ax_switch_flags.m4-properly-quote-m4_fatal.patch (100%) create mode 100644 overlays/cava/default.nix diff --git a/overlays/autoconf-archive/default.nix b/overlays/autoconf-archive/default.nix deleted file mode 100644 index fb0e2cf..0000000 --- a/overlays/autoconf-archive/default.nix +++ /dev/null @@ -1,15 +0,0 @@ -{lib, ...}: -with lib; - singleton (final: prev: { - # TODO: Remove when https://github.com/NixOS/nixpkgs/pull/355948 is merged into unstable branch - autoconf-archive = prev.autoconf-archive.overrideAttrs (prevAttrs: { - 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 - ]; - }); - }) diff --git a/overlays/autoconf-archive/0001-ax_check_gl.m4-properly-quote-m4_fatal.patch b/overlays/cava/0001-ax_check_gl.m4-properly-quote-m4_fatal.patch similarity index 100% rename from overlays/autoconf-archive/0001-ax_check_gl.m4-properly-quote-m4_fatal.patch rename to overlays/cava/0001-ax_check_gl.m4-properly-quote-m4_fatal.patch diff --git a/overlays/autoconf-archive/0002-ax_check_glx.m4-properly-quote-m4_fatal.patch b/overlays/cava/0002-ax_check_glx.m4-properly-quote-m4_fatal.patch similarity index 100% rename from overlays/autoconf-archive/0002-ax_check_glx.m4-properly-quote-m4_fatal.patch rename to overlays/cava/0002-ax_check_glx.m4-properly-quote-m4_fatal.patch diff --git a/overlays/autoconf-archive/0003-ax_switch_flags.m4-properly-quote-m4_fatal.patch b/overlays/cava/0003-ax_switch_flags.m4-properly-quote-m4_fatal.patch similarity index 100% rename from overlays/autoconf-archive/0003-ax_switch_flags.m4-properly-quote-m4_fatal.patch rename to overlays/cava/0003-ax_switch_flags.m4-properly-quote-m4_fatal.patch diff --git a/overlays/cava/default.nix b/overlays/cava/default.nix new file mode 100644 index 0000000..4d2b009 --- /dev/null +++ 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 + ]; + }) + ]; + }); + })