From 9f5f2746ade58a454b513118644c519854e36f5d Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 3 Jun 2024 18:35:17 +0530
Subject: [PATCH 1/3] ananicy-cpp: move to by-name

---
 .../default.nix => by-name/an/ananicy-cpp/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{misc/ananicy-cpp/default.nix => by-name/an/ananicy-cpp/package.nix} (100%)

diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
similarity index 100%
rename from pkgs/misc/ananicy-cpp/default.nix
rename to pkgs/by-name/an/ananicy-cpp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 66cdefee0b5b..e717ebff55ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -28203,8 +28203,6 @@ with pkgs;
 
   ananicy = callPackage ../misc/ananicy { };
 
-  ananicy-cpp = callPackage ../misc/ananicy-cpp { };
-
   andagii = callPackage ../data/fonts/andagii { };
 
   andika = callPackage ../data/fonts/andika { };

From f65bd7b775d459bfa55f9535f41c1b3324d70b8c Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 3 Jun 2024 18:53:58 +0530
Subject: [PATCH 2/3] ananicy-cpp: enable regex support

Fetch the patch from https://gitlab.com/ananicy-cpp/ananicy-cpp/-/merge_requests/26
---
 pkgs/by-name/an/ananicy-cpp/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
index 9a771a470339..f7140615523c 100644
--- a/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -1,6 +1,7 @@
 { lib
 , clangStdenv
 , fetchFromGitLab
+, fetchpatch
 , cmake
 , pkg-config
 , spdlog
@@ -9,6 +10,7 @@
 , libbpf
 , elfutils
 , bpftools
+, pcre2
 , zlib
 }:
 
@@ -24,6 +26,15 @@ clangStdenv.mkDerivation rec {
     sha256 = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
   };
 
+  patches = [
+    # FIXME: remove this 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=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -33,6 +44,7 @@ clangStdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    pcre2
     spdlog
     nlohmann_json
     systemd
@@ -51,6 +63,7 @@ clangStdenv.mkDerivation rec {
     "-DUSE_BPF_PROC_IMPL=ON"
     "-DBPF_BUILD_LIBBPF=OFF"
     "-DENABLE_SYSTEMD=ON"
+    "-DENABLE_REGEX_SUPPORT=ON"
     "-DVERSION=${version}"
   ];
 

From 1501a531dbe77d4bf0bddc96cfc2fa805315dc71 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 3 Jun 2024 19:01:30 +0530
Subject: [PATCH 3/3] ananicy-cpp: add johnrtitor as maintainer

---
 pkgs/by-name/an/ananicy-cpp/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix
index f7140615523c..36f56c6dffaf 100644
--- a/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -72,12 +72,15 @@ clangStdenv.mkDerivation rec {
     rm -rf "$out"/lib/cmake
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp";
     description = "Rewrite of ananicy in c++ for lower cpu and memory usage";
-    license = licenses.gpl3Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ artturin ];
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      artturin
+      johnrtitor
+    ];
     mainProgram = "ananicy-cpp";
   };
 }