gui-installer: depend on git + ignore flake config

2024-05-29 17:42:44 +02:00 · 2024-05-29 17:42:44 +02:00 · ccadac4bb3
commit ccadac4bb3
parent 15b77f6b8a
2 changed files with 9 additions and 1 deletions
--- 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 = [
--- 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 -- "$@"
 }