From 5421bf0ed95e5d0a521db177b9ff1dd29aef0bf9 Mon Sep 17 00:00:00 2001
From: Armeen Mahdian <mahdianarmeen@gmail.com>
Date: Fri, 13 May 2022 18:35:46 -0500
Subject: [PATCH] arc_unpacker: unstable-2021-05-17 -> unstable-2021-08-06

---
 pkgs/tools/archivers/arc_unpacker/default.nix | 9 +++------
 pkgs/top-level/all-packages.nix               | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/archivers/arc_unpacker/default.nix b/pkgs/tools/archivers/arc_unpacker/default.nix
index 7fbd93023970..561567f8b154 100644
--- a/pkgs/tools/archivers/arc_unpacker/default.nix
+++ b/pkgs/tools/archivers/arc_unpacker/default.nix
@@ -3,16 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "arc_unpacker";
-  version = "unstable-2021-05-17";
+  version = "unstable-2021-08-06";
 
   src = fetchFromGitHub {
     owner = "vn-tools";
     repo = "arc_unpacker";
-    # Since the latest release (0.11) doesn't build, we've opened an upstream
-    # issue in https://github.com/vn-tools/arc_unpacker/issues/187 to ask if a
-    # a new release is upcoming
-    rev = "9c2781fcf3ead7641e873b65899f6abeeabb2fc8";
-    sha256 = "1xxrc9nww0rla3yh10z6glv05ax4rynwwbd0cdvkp7gyqzrv97xp";
+    rev = "456834ecf2e5686813802c37efd829310485c57d";
+    hash = "sha256-STbdWH7Mr3gpOrZvujblYrIIKEWBHzy1/BaNuh4teI8=";
   };
 
   nativeBuildInputs = [ cmake makeWrapper catch2 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3226537e8ba..bd591a922661 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -997,6 +997,7 @@ with pkgs;
 
   arc_unpacker = callPackage ../tools/archivers/arc_unpacker {
     boost = boost16x; # checkPhase fails with Boost 1.77
+    stdenv = if stdenv.cc.isGNU then gcc10Stdenv else stdenv;
   };
 
   adminer = callPackage ../servers/adminer { };