From aa53fe3c3b4ab4603b8d04f8b35007dfd2d6c5d6 Mon Sep 17 00:00:00 2001
From: Uwe Winter <uwwint@gmail.com>
Date: Tue, 10 Feb 2026 11:23:43 +1100
Subject: [PATCH] fix: system uv can select a different python version than in
 the conda environment

---
 scripts/common_startup.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index 4863cb769b1..ca133b1c7e6 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -118,7 +118,8 @@ if [ $SET_VENV -eq 1 ] && [ $CREATE_VENV -eq 1 ]; then
                 conda_activate
             fi
             if command -v uv >/dev/null; then
-                uv venv "$GALAXY_VIRTUAL_ENV"
+                # Ensure uv uses the active conda python to avoid picking a different interpreter on PATH.
+                uv venv --python "${CONDA_PREFIX}/bin/python" "$GALAXY_VIRTUAL_ENV"
             else
                 python3 -m venv "$GALAXY_VIRTUAL_ENV"
             fi