wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 06:01:48 +02:00
Code Activity

Merge pull request #12484 from NixOS/libgit2-1.9.0

Browse source 
Support libgit2 1.9.0
This commit is contained in:
John Ericson 2025-02-17 12:08:05 -05:00 • committed by GitHub
commit 63a603d8c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

51
packaging/dependencies.nix
View file

@ -138,7 +138,8 @@ let
enableParallelBuilding = true; enableParallelBuilding = true;
}; };
in in
scope: { scope:
{
inherit stdenv; inherit stdenv;
aws-sdk-cpp = aws-sdk-cpp =
@ -174,6 +175,31 @@ scope: {
installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase; installPhase = lib.replaceStrings [ "--without-python" ] [ "" ] old.installPhase;
}); });
inherit resolvePath filesetToSource;
mkMesonDerivation = mkPackageBuilder [
miscGoodPractice
localSourceLayer
mesonLayer
];
mkMesonExecutable = mkPackageBuilder [
miscGoodPractice
bsdNoLinkAsNeeded
localSourceLayer
mesonLayer
mesonBuildLayer
];
mkMesonLibrary = mkPackageBuilder [
miscGoodPractice
bsdNoLinkAsNeeded
localSourceLayer
mesonLayer
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" ]; cmakeFlags = attrs.cmakeFlags or [ ] ++ [ "-DUSE_SSH=exec" ];
nativeBuildInputs = nativeBuildInputs =
@ -203,27 +229,4 @@ scope: {
./patches/libgit2-packbuilder-callback-interruptible.patch ./patches/libgit2-packbuilder-callback-interruptible.patch
]; ];
}); });
inherit resolvePath filesetToSource;
mkMesonDerivation = mkPackageBuilder [
miscGoodPractice
localSourceLayer
mesonLayer
];
mkMesonExecutable = mkPackageBuilder [
miscGoodPractice
bsdNoLinkAsNeeded
localSourceLayer
mesonLayer
mesonBuildLayer
];
mkMesonLibrary = mkPackageBuilder [
miscGoodPractice
bsdNoLinkAsNeeded
localSourceLayer
mesonLayer
mesonBuildLayer
mesonLibraryLayer
];
} }