Update and build script

flake.nix

@@ -14,7 +14,6 @@
     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 =
@@ -32,9 +31,6 @@
       ];
       perSystem =
         { pkgs, self', ... }@inputs':
-        let
-          #arm = (import inputs.aarch_fix { inherit (inputs') system; });
-        in
         {
           _module.args.pkgs = import inputs.nixpkgs {
             inherit (inputs') system;
@@ -67,7 +63,7 @@
                 end-of-file-fixer.enable = true;
                 fix-byte-order-marker.enable = true;
                 mixed-line-endings.enable = true;
-                nixfmt-rfc-style.enable = true;
+                nixfmt.enable = true;
                 trim-trailing-whitespace.enable = true;
               };
             };
@@ -79,16 +75,25 @@
               tar =
                 win:
                 let
-                  svnSword = (
-                    win.sword.overrideAttrs {
+                  svnSword =
+                    (win.sword.overrideAttrs {
                       src = pkgs.fetchsvn {
                         url = "https://svn.crosswire.org/svn/sword/trunk";
                         rev = "3914";
                         hash = "sha256-yqZtUb86KILTYcshe/qim5+H57ktKlH3Uiic6KDKnrQ=";
                       };
                       patches = [ ];
-                    }
-                  );
+                    }).override
+                      {
+                        curl = curlMinimal;
+                      };
+                  curlMinimal = win.curlMinimal.overrideAttrs (final: {
+                    buildInputs = [ ];
+                    # This causes circular dependencies on bash, which is not supported in MinGW
+                    postInstall = final.postInstall + ''
+                      rm "''${!outputBin}/bin/wcurl"
+                    '';
+                  });
                 in
                 pkgs.writeShellApplication {
                   name = "package-sword";
@@ -110,7 +115,7 @@
               default = tar mingwW64;
               x86 = tar mingwW64;
               ucrt = tar ucrt64;
-              #ucrtAarch = tar arm.pkgsCross.ucrtAarch64;
+              #ucrtAarch = tar ucrtAarch64;
               update = pkgs.callPackage ./update.nix { };
             };
         };