Merge branch 'main' into develop

firecat53 · Oct 15, 2024 · 30cee06 · 30cee06
2 parents 9559c1c + 71efc07
commit 30cee06
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/flake.nix b/flake.nix
@@ -31,6 +31,8 @@
         postVenvCreation = ''
           uv pip install hatch
           uv pip install -e .
+          # Prevent venv uv from overriding nixpkgs uv
+          [ -f $(pwd)/.venv/bin/uv ] && rm $(pwd)/.venv/bin/uv*
         '';
         C_INCLUDE_PATH = "${pkgs.linuxHeaders}/include";
         HATCH_ENV_TYPE_VIRTUAL_UV_PATH = "${pkgs.uv}/bin/uv"; # use Nix uv instead of hatch downloaded binary