1
0
forked from clan/clan-core

Merge pull request 'gui-installer: depend on git + ignore flake config' (#1498) from DavHau-dave into main

This commit is contained in:
clan-bot 2024-05-29 15:48:54 +00:00
commit 5945630870
2 changed files with 9 additions and 1 deletions

View File

@ -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 = [

View File

@ -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 -- "$@"
}