wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

Merge pull request #12523 from NixOS/mergify/bp/2.26-maintenance/pr-12518

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

16
packaging/dependencies.nix
View file

@ -29,8 +29,7 @@ let
darwinStdenv = pkgs.overrideSDK prevStdenv { darwinMinVersion = "10.13"; }; darwinStdenv = pkgs.overrideSDK prevStdenv { darwinMinVersion = "10.13"; };
in in
scope: scope: {
{
inherit stdenv; inherit stdenv;
aws-sdk-cpp = aws-sdk-cpp =
@ -66,11 +65,13 @@ scope:
installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase; installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
}); });
} libgit2 = pkgs.libgit2.overrideAttrs (
# libgit2: Nixpkgs 24.11 has < 1.9.0 attrs:
// lib.optionalAttrs (!lib.versionAtLeast pkgs.libgit2.version "1.9.0") { {
libgit2 = pkgs.libgit2.overrideAttrs (attrs: {
cmakeFlags = attrs.cmakeFlags or [ ] ++ [ "-DUSE_SSH=exec" ]; 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") {
nativeBuildInputs = nativeBuildInputs =
attrs.nativeBuildInputs or [ ] attrs.nativeBuildInputs or [ ]
# gitMinimal does not build on Windows. See packbuilder patch. # gitMinimal does not build on Windows. See packbuilder patch.
@ -97,5 +98,6 @@ scope:
# binary patch; see `prePatch` # binary patch; see `prePatch`
./patches/libgit2-packbuilder-callback-interruptible.patch ./patches/libgit2-packbuilder-callback-interruptible.patch
]; ];
}); }
);
} }