From 9a1f8947df4d6a0357206e26c111aee38f215483 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Fri, 27 Dec 2024 12:13:16 +0530
Subject: [PATCH 1/2] ananicy-cpp: unvendor mtabs upstream patch

---
 pkgs/by-name/an/ananicy-cpp/package.nix             | 12 ++++++++----
 .../an/ananicy-cpp/reliable-mounts-file.patch       | 13 -------------
 2 files changed, 8 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch

diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
index 1539f89b4f37..5727654ea527 100644
--- a/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -29,15 +29,19 @@ clangStdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
-    # FIXME: remove this when updating to next stable release
+    ./match-wrappers.patch
+
+    # FIXME: remove these when updating to next stable release
     (fetchpatch {
       name = "allow-regex-pattern-matching.patch";
       url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/6ea2dccceec39b6c4913f617dad81d859aa20f24.patch";
       hash = "sha256-C+7x/VpVwewXEPwibi7GxGfjuhDkhcjTyGbZHlYL2Bs=";
     })
-    ./match-wrappers.patch
-    # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/27
-    ./reliable-mounts-file.patch
+    (fetchpatch {
+      name = "use-a-reliable-path-for-mounts-file.patch";
+      url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/de6f11978db98bfd13a1e87dcdab61dbe6496710.patch";
+      hash = "sha256-9bJlFCClddlAEknfqp7Gcij7NX6tqohE2wqoalLoN5I=";
+    })
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch b/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch
deleted file mode 100644
index 9daccc3d94e2..000000000000
--- a/pkgs/by-name/an/ananicy-cpp/reliable-mounts-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/platform/linux/cgroups.cpp b/src/platform/linux/cgroups.cpp
-index 766fd2f5247ce64eb7dfd45e5551f41773eaa18b..d27dbf724bdf5097dfda0c8d4eaaadb3e81f70b3 100644
---- a/src/platform/linux/cgroups.cpp
-+++ b/src/platform/linux/cgroups.cpp
-@@ -223,7 +223,7 @@ control_groups::cgroup_info control_groups::get_cgroup_version(bool reset) {
-   }
- 
-   if (!info.has_value()) {
--    std::ifstream mtab("/etc/mtab");
-+    std::ifstream mtab("/proc/self/mounts");
-     while (mtab) {
-       std::string       word, line;
-       fs::path          cgroup_path;

From f03e79ebd9c6e52d49cd6e365942ee043beee3ac Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 24 Dec 2024 19:47:51 +0530
Subject: [PATCH 2/2] ananicy-cpp: fix build with llvm_19

> error: a template argument list is expected after a name prefixed by the template keyword [-Wmissing-template-arg-list-after-template-kw]

Co-authored-by: Reno Dakota <paparodeo@proton.me>
Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/an/ananicy-cpp/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
index 5727654ea527..b83aa1ca208a 100644
--- a/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -42,6 +42,12 @@ clangStdenv.mkDerivation (finalAttrs: {
       url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/de6f11978db98bfd13a1e87dcdab61dbe6496710.patch";
       hash = "sha256-9bJlFCClddlAEknfqp7Gcij7NX6tqohE2wqoalLoN5I=";
     })
+    # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/30
+    (fetchpatch {
+      name = "fix-build-with-clang-19.patch";
+      url = "https://gitlab.com/ananicy-cpp/ananicy-cpp/-/commit/b2589a9b1faa2ecf54aeede40ea781c33bfb09a8.patch";
+      hash = "sha256-nfyCdhvnWj446z5aPFCXGi79Xgja8W0Eopl6I30fOBM=";
+    })
   ];
 
   strictDeps = true;