From b0bbb1252a8ae8d925e2cb45d1c778b9c00587e2 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 17 Feb 2025 17:17:37 +0100
Subject: [PATCH] Support libgit2 1.9.0

For when the overlay is used with nixos-unstable.
1.9.0 has our patches.
---
 packaging/dependencies.nix | 51 ++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 24 deletions(-)

diff --git a/packaging/dependencies.nix b/packaging/dependencies.nix
index afbc31fc6..b23c9cbcd 100644
--- a/packaging/dependencies.nix
+++ b/packaging/dependencies.nix
@@ -138,7 +138,8 @@ let
     enableParallelBuilding = true;
   };
 in
-scope: {
+scope:
+{
   inherit stdenv;
 
   aws-sdk-cpp =
@@ -174,6 +175,31 @@ scope: {
         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: {
     cmakeFlags = attrs.cmakeFlags or [ ] ++ [ "-DUSE_SSH=exec" ];
     nativeBuildInputs =
@@ -203,27 +229,4 @@ scope: {
         ./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
-  ];
 }