From ed4af70ad410a585b313454cd6e52c43d6e30e8d Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Thu, 6 Nov 2025 17:49:57 +0900
Subject: [PATCH] arc_unpacker: move some things out of patch files

---
 pkgs/by-name/ar/arc_unpacker/package.nix | 27 ++++++++++++------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ar/arc_unpacker/package.nix b/pkgs/by-name/ar/arc_unpacker/package.nix
index 997ab31e0955..bfb87344a05d 100644
--- a/pkgs/by-name/ar/arc_unpacker/package.nix
+++ b/pkgs/by-name/ar/arc_unpacker/package.nix
@@ -27,23 +27,14 @@ stdenv.mkDerivation {
     hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8=";
   };
 
-  patches = [
-    ./fix-test-float-variance.patch
-    (fetchpatch {
-      name = "failing_tests.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/failing_tests.patch?h=arc_unpacker-git&id=bda1ad9f69e6802e703b2e6913d71a36d76cfef9";
-      hash = "sha256-bClACsf/+SktyLAPtt7EcSqprkw8JVIi1ZLpcJcv9IE=";
-    })
-    (fetchpatch {
-      name = "include_cstdint.patch";
-      url = "https://aur.archlinux.org/cgit/aur.git/plain/include_cstdint.patch?h=arc_unpacker-git&id=8c5c5121b23813c7650db19cb617b409d8fdcc9f";
-      hash = "sha256-3BQ1v7s9enUK/js7Jqrqo2RdSRvGVd7hMcY4iL51SiE=";
-    })
-  ];
+  patches = [ ./fix-test-float-variance.patch ];
 
   postPatch = ''
     cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
+
+    # missing includes
     sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
+    sed '1i#include <cstdint>' -i src/types.h # gcc13
     sed '1i#include <vector>' -i src/flow/cli_facade.h # gcc14
 
     # cmake-4 support
@@ -70,10 +61,18 @@ stdenv.mkDerivation {
   ];
 
   checkPhase = ''
+    # Specify test targets
+    # https://catch2-temp.readthedocs.io/en/latest/command-line.html#specifying-which-tests-to-run
+    checkTarget=('~CatSystem INT archives')
+
     runHook preCheck
 
+    local flagsArray=()
+    concatTo flagsArray checkFlags checkFlagsArray checkTarget
+
     pushd ..
-    ./build/run_tests
+    echoCmd 'check flags' "''${flagsArray[@]}"
+    ./build/run_tests "''${flagsArray[@]}"
     popd
 
     runHook postCheck