Skip to content

Commit c1fe354

Browse files
committed
libgit2: Add libgit2-packbuilder-callback-interruptible.patch
1 parent 57c4830 commit c1fe354

2 files changed

Lines changed: 947 additions & 1 deletion

File tree

packaging/dependencies.nix

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,24 @@ scope: {
115115
version = inputs.libgit2.lastModifiedDate;
116116
cmakeFlags = attrs.cmakeFlags or []
117117
++ [ "-DUSE_SSH=exec" ];
118+
nativeBuildInputs = attrs.nativeBuildInputs or []
119+
++ [
120+
# Needed for `git apply`; see `prePatch`
121+
pkgs.buildPackages.gitMinimal
122+
];
123+
# Only `git apply` can handle git binary patches
124+
prePatch = ''
125+
patch() {
126+
git apply
127+
}
128+
'';
118129
patches = attrs.patches or []
119-
++ [ ./patches/libgit2-mempack-thin-packfile.patch ];
130+
++ [
131+
./patches/libgit2-mempack-thin-packfile.patch
132+
133+
# binary patch; see `prePatch`
134+
./patches/libgit2-packbuilder-callback-interruptible.patch
135+
];
120136
});
121137

122138
busybox-sandbox-shell = pkgs.busybox-sandbox-shell or (pkgs.busybox.override {

0 commit comments

Comments
 (0)