From ccadac4bb3ed51022dc856ea28128ed6e7970562 Mon Sep 17 00:00:00 2001
From: DavHau <d.hauer.it@gmail.com>
Date: Wed, 29 May 2024 17:42:44 +0200
Subject: [PATCH] gui-installer: depend on git + ignore flake config

---
 pkgs/clan-cli/default.nix           | 9 ++++++++-
 pkgs/gui-installer/gui-installer.sh | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/clan-cli/default.nix b/pkgs/clan-cli/default.nix
index 28ed0992..9ecd8792 100644
--- a/pkgs/clan-cli/default.nix
+++ b/pkgs/clan-cli/default.nix
@@ -29,6 +29,7 @@
   mypy,
   nixpkgs,
   clan-core-path,
+  gitMinimal,
 }:
 let
   # Dependencies that are directly used in the project
@@ -113,7 +114,13 @@ python3.pkgs.buildPythonApplication {
   format = "pyproject";
 
   # Arguments for the wrapper to unset LD_LIBRARY_PATH to avoid glibc version issues
-  makeWrapperArgs = [ "--unset LD_LIBRARY_PATH" ];
+  makeWrapperArgs = [
+    "--unset LD_LIBRARY_PATH"
+    "--suffix"
+    "PATH"
+    ":"
+    "${gitMinimal}/bin/git"
+  ];
 
   # Build-time dependencies.
   nativeBuildInputs = [
diff --git a/pkgs/gui-installer/gui-installer.sh b/pkgs/gui-installer/gui-installer.sh
index 3f3ed3ae..a0df0899 100755
--- a/pkgs/gui-installer/gui-installer.sh
+++ b/pkgs/gui-installer/gui-installer.sh
@@ -43,6 +43,7 @@ ensure_nix_installed() {
 start_clan_gui() {
   exec nix run \
     https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-vm-manager \
+    --no-accept-flake-config \
     --extra-experimental-features flakes nix-command -- "$@"
 }