From 7be048a6c3abfaa1b4b632018ea08422ec1b33d8 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Wed, 6 Aug 2025 20:14:45 -0500
Subject: [PATCH] Update to r3912

---
 flake.lock | 17 +++++++++++++++++
 flake.nix  | 10 +++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index a7db576..75f2761 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,21 @@
 {
   "nodes": {
+    "aarch_fix": {
+      "locked": {
+        "lastModified": 1753636920,
+        "narHash": "sha256-BZq0xc6+3OVxUE+re+Rd+5+JqmGUARxa0M1waMkscyk=",
+        "owner": "greg-hellings",
+        "repo": "nixpkgs",
+        "rev": "54692b15811727c1cd367dbd82e6e22abd1bd057",
+        "type": "github"
+      },
+      "original": {
+        "owner": "greg-hellings",
+        "ref": "ucrt/zlib",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -139,6 +155,7 @@
     },
     "root": {
       "inputs": {
+        "aarch_fix": "aarch_fix",
         "flake-parts": "flake-parts",
         "flake-root": "flake-root",
         "hooks": "hooks",
diff --git a/flake.nix b/flake.nix
index a64a7fc..19e7580 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,6 +14,7 @@
     flake-parts.url = "github:hercules-ci/flake-parts";
     flake-root.url = "github:srid/flake-root";
     hooks.url = "github:cachix/git-hooks.nix";
+    aarch_fix.url = "github:greg-hellings/nixpkgs/ucrt/zlib";
   };
 
   outputs =
@@ -31,6 +32,9 @@
       ];
       perSystem =
         { pkgs, self', ... }@inputs':
+        let
+          arm = (import inputs.aarch_fix { inherit (inputs') system; });
+        in
         {
           _module.args.pkgs = import inputs.nixpkgs {
             inherit (inputs') system;
@@ -73,8 +77,8 @@
                     win.sword.overrideAttrs {
                       src = pkgs.fetchsvn {
                         url = "https://svn.crosswire.org/svn/sword/trunk";
-                        rev = "3906";
-                        hash = "sha256-n4wcDBzUjlVSIHYGw8BKWrl1pFGkdkDXLMnJqr754vI=";
+                        rev = "3912";
+                        hash = "sha256-2VgoBdoJtbND++aQ2kDomr6LjYcUyyDwbgWNp5k07Uk=";
                       };
                       patches = [ ];
                     }
@@ -100,7 +104,7 @@
               default = tar mingwW64;
               x86 = tar mingwW64;
               ucrt = tar ucrt64;
-              ucrtAarch = tar ucrtAarch64;
+              ucrtAarch = tar arm.pkgsCross.ucrtAarch64;
             };
         };
     };