From cb092429d2aa6f2721e395ee42a8d627e2d52a19 Mon Sep 17 00:00:00 2001
From: Naxdy <naxdy@naxdy.org>
Date: Tue, 8 Oct 2024 17:33:30 +0200
Subject: [PATCH] consider additionalCargoLock for git dependencies

---
 default.nix | 2 +-
 lib.nix     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/default.nix b/default.nix
index 1bc1383..e5194c5 100644
--- a/default.nix
+++ b/default.nix
@@ -29,7 +29,7 @@ let
     let
       config = mkConfig arg;
       gitDependencies =
-        libb.findGitDependencies { inherit (config) cargolock gitAllRefs gitSubmodules; };
+        libb.findGitDependencies { inherit (config) cargolock additionalcargolock gitAllRefs gitSubmodules; };
       cargoconfig =
         if builtinz.pathExists (toString config.root + "/.cargo/config")
         then (config.root + "/.cargo/config")
diff --git a/lib.nix b/lib.nix
index 1e71da3..5fbfff2 100644
--- a/lib.nix
+++ b/lib.nix
@@ -73,7 +73,7 @@ rec
   #   }
   # ]
   findGitDependencies =
-    { cargolock, gitAllRefs, gitSubmodules }:
+    { cargolock, additionalcargolock, gitAllRefs, gitSubmodules }:
     let
       query = p: (lib.substring 0 4 (p.source or "")) == "git+";
 
@@ -101,10 +101,10 @@ rec
         // (lib.optionalAttrs (! isNull rev) { inherit rev; });
 
       usedPackageLocks =
-        builtins.map parseLock (lib.filter query cargolock.package);
+        builtins.map parseLock ((lib.filter query cargolock.package) ++ (lib.optionals (! isNull additionalcargolock) (lib.filter query additionalcargolock.package)));
 
       unusedPackageLocks =
-        builtins.map parseLock (lib.filter query ((cargolock.patch or []).unused or []));
+        builtins.map parseLock (lib.filter query ((cargolock.patch or [ ]).unused or [ ])) ++ (lib.optionals (! isNull additionalcargolock) (lib.filter query ((additionalcargolock.patch or [ ]).unused or [ ])));
 
       packageLocks = usedPackageLocks ++ unusedPackageLocks;