From 68b17279079c4b7b37ce18ecdac33ecf2fd1e037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 4 Feb 2023 12:35:47 +0100
Subject: [PATCH] anbox, arc_unpacker: fix build after defaulting to gcc12

---
 pkgs/os-specific/linux/anbox/default.nix      | 4 ++--
 pkgs/tools/archivers/arc_unpacker/default.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix
index 9d3afc9ad218..9c41a217badc 100644
--- a/pkgs/os-specific/linux/anbox/default.nix
+++ b/pkgs/os-specific/linux/anbox/default.nix
@@ -85,8 +85,8 @@ stdenv.mkDerivation rec {
     systemd
   ];
 
-  NIX_CFLAGS_COMPILE = [
-    # Needed with GCC 12
+  # Flag needed by GCC 12 but unrecognized by GCC 9 (aarch64-linux default now)
+  NIX_CFLAGS_COMPILE = lib.optionals (with stdenv; cc.isGNU && lib.versionAtLeast cc.version "12") [
     "-Wno-error=mismatched-new-delete"
   ];
 
diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix
index 561567f8b154..3806ca41f2cd 100644
--- a/pkgs/tools/archivers/arc_unpacker/default.nix
+++ b/pkgs/tools/archivers/arc_unpacker/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
+    sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
   '';
 
   checkPhase = ''