nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-17 07:52:43 +01:00
Code Activity

Merge pull request #12522 from NixOS/mergify/bp/2.25-maintenance/pr-12518

Browse source 
packaging: Restore libgit2 USE_SSH=exec (backport #12518)
This commit is contained in:
mergify[bot] 2025-02-19 09:18:52 +00:00 • committed by GitHub
commit 9e7663fe38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

19
packaging/dependencies.nix
View file

@ -102,8 +102,7 @@ let
enableParallelBuilding = true;
};
in
scope:
{
scope: {
inherit stdenv;
aws-sdk-cpp =
@ -200,13 +199,16 @@ scope:
mesonBuildLayer
mesonLibraryLayer
];
}
# libgit2: Nixpkgs 24.11 has < 1.9.0
// lib.optionalAttrs (!lib.versionAtLeast pkgs.libgit2.version "1.9.0") {
libgit2 = pkgs.libgit2.overrideAttrs (attrs: {
libgit2 = pkgs.libgit2.overrideAttrs (
attrs:
{
cmakeFlags = attrs.cmakeFlags or [ ] ++ [ "-DUSE_SSH=exec" ];
}
# libgit2: Nixpkgs 24.11 has < 1.9.0, which needs our patches
// lib.optionalAttrs (!lib.versionAtLeast pkgs.libgit2.version "1.9.0") {
src = inputs.libgit2;
version = inputs.libgit2.lastModifiedDate;
cmakeFlags = attrs.cmakeFlags or [ ] ++ [ "-DUSE_SSH=exec" ];
nativeBuildInputs =
attrs.nativeBuildInputs or [ ]
# gitMinimal does not build on Windows. See packbuilder patch.
@ -233,5 +235,6 @@ scope:
# binary patch; see `prePatch`
./patches/libgit2-packbuilder-callback-interruptible.patch
];
});
}
);
}