yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

gui-installer: depend on git + ignore flake config

Browse Source
This commit is contained in:
DavHau
2024-05-29 17:42:44 +02:00
parent 15b77f6b8a
commit ccadac4bb3
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/clan-cli/default.nix
View File

@@ -29,6 +29,7 @@
mypy, mypy,
nixpkgs, nixpkgs,
clan-core-path, clan-core-path,
gitMinimal,
}: }:
let let
# Dependencies that are directly used in the project # Dependencies that are directly used in the project
@@ -113,7 +114,13 @@ python3.pkgs.buildPythonApplication {
format = "pyproject"; format = "pyproject";
# Arguments for the wrapper to unset LD_LIBRARY_PATH to avoid glibc version issues # 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. # Build-time dependencies.
nativeBuildInputs = [ nativeBuildInputs = [

1
pkgs/gui-installer/gui-installer.sh
View File

@@ -43,6 +43,7 @@ ensure_nix_installed() {
start_clan_gui() { start_clan_gui() {
exec nix run \ exec nix run \
https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-vm-manager \ https://git.clan.lol/clan/clan-core/archive/main.tar.gz#clan-vm-manager \
--no-accept-flake-config \
--extra-experimental-features flakes nix-command -- "$@" --extra-experimental-features flakes nix-command -- "$@"
} }