libgit2: Add libgit2-packbuilder-callback-interruptible.patch

NixOS · Aug 27, 2024 · bc03ad8 · bc03ad8
1 parent 381f7fa
commit bc03ad8
Show file tree

Hide file tree

Showing 2 changed files with 947 additions and 1 deletion.
diff --git a/packaging/dependencies.nix b/packaging/dependencies.nix
@@ -115,8 +115,24 @@ scope: {
     version = inputs.libgit2.lastModifiedDate;
     cmakeFlags = attrs.cmakeFlags or []
       ++ [ "-DUSE_SSH=exec" ];
+    nativeBuildInputs = attrs.nativeBuildInputs or []
+      ++ [
+        # Needed for `git apply`; see `prePatch`
+        pkgs.gitMinimal
+      ];
+    # Only `git apply` can handle git binary patches
+    prePatch = ''
+      patch() {
+        git apply
+      }
+    '';
     patches = attrs.patches or []
-      ++ [ ./patches/libgit2-mempack-thin-packfile.patch ];
+      ++ [
+        ./patches/libgit2-mempack-thin-packfile.patch
+
+        # binary patch; see `prePatch`
+        ./patches/libgit2-packbuilder-callback-interruptible.patch
+      ];
   });
 
   busybox-sandbox-shell = pkgs.busybox-sandbox-shell or (pkgs.busybox.override {