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

clan-vm-manager: simplify shellHook

Browse Source
This commit is contained in:
Jörg Thalheim
2023-11-23 15:07:08 +01:00
parent f68c10a008
commit b8f5c13553
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/clan-cli/shell.nix
View File

@@ -38,9 +38,8 @@ mkShell {
--prefix "$tmp_path/python" \ --prefix "$tmp_path/python" \
--editable $repo_root --editable $repo_root
rm -f clan_cli/nixpkgs clan_cli/webui/assets ln -sfT ${clan-cli.nixpkgs} clan_cli/nixpkgs
ln -sf ${clan-cli.nixpkgs} clan_cli/nixpkgs ln -sfT ${ui-assets} clan_cli/webui/assets
ln -sf ${ui-assets} clan_cli/webui/assets
export PATH="$tmp_path/python/bin:${checkScript}/bin:$PATH" export PATH="$tmp_path/python/bin:${checkScript}/bin:$PATH"
export PYTHONPATH="$repo_root:$tmp_path/python/${pythonWithDeps.sitePackages}:" export PYTHONPATH="$repo_root:$tmp_path/python/${pythonWithDeps.sitePackages}:"

3
pkgs/clan-vm-manager/shell.nix
View File

@@ -9,7 +9,6 @@ mkShell {
] ++ clan-vm-manager.nativeBuildInputs; ] ++ clan-vm-manager.nativeBuildInputs;
shellHook = '' shellHook = ''
rm -f ../clan-cli/clan_cli/nixpkgs ln -sfT ${clan-cli.nixpkgs} ../clan-cli/clan_cli/nixpkgs
ln -sf ${clan-cli.nixpkgs} ../clan-cli/clan_cli/nixpkgs
''; '';
} }