From b8f5c135537af1e7973edf1bac415183d161cb78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Nov 2023 15:07:08 +0100 Subject: [PATCH] clan-vm-manager: simplify shellHook --- pkgs/clan-cli/shell.nix | 5 ++--- pkgs/clan-vm-manager/shell.nix | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/clan-cli/shell.nix b/pkgs/clan-cli/shell.nix index 1bae91900..055154739 100644 --- a/pkgs/clan-cli/shell.nix +++ b/pkgs/clan-cli/shell.nix @@ -38,9 +38,8 @@ mkShell { --prefix "$tmp_path/python" \ --editable $repo_root - rm -f clan_cli/nixpkgs clan_cli/webui/assets - ln -sf ${clan-cli.nixpkgs} clan_cli/nixpkgs - ln -sf ${ui-assets} clan_cli/webui/assets + ln -sfT ${clan-cli.nixpkgs} clan_cli/nixpkgs + ln -sfT ${ui-assets} clan_cli/webui/assets export PATH="$tmp_path/python/bin:${checkScript}/bin:$PATH" export PYTHONPATH="$repo_root:$tmp_path/python/${pythonWithDeps.sitePackages}:" diff --git a/pkgs/clan-vm-manager/shell.nix b/pkgs/clan-vm-manager/shell.nix index aecc5cd42..878ae09c3 100644 --- a/pkgs/clan-vm-manager/shell.nix +++ b/pkgs/clan-vm-manager/shell.nix @@ -9,7 +9,6 @@ mkShell { ] ++ clan-vm-manager.nativeBuildInputs; shellHook = '' - rm -f ../clan-cli/clan_cli/nixpkgs - ln -sf ${clan-cli.nixpkgs} ../clan-cli/clan_cli/nixpkgs + ln -sfT ${clan-cli.nixpkgs} ../clan-cli/clan_cli/nixpkgs ''; }