From 8c6463d22098fcaa083487b5c1ba2620c92571d7 Mon Sep 17 00:00:00 2001
From: konsti <konstin@mailbox.org>
Date: Mon, 18 Dec 2023 09:42:31 +0100
Subject: [PATCH] Allow identical `VIRTUAL_ENV` and `CONDA_PREFIX` env vars
 (#681)

Port of https://github.com/PyO3/maturin/pull/1879 for
https://github.com/PyO3/maturin/issues/1878
---
 crates/puffin-interpreter/src/virtual_env.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/puffin-interpreter/src/virtual_env.rs b/crates/puffin-interpreter/src/virtual_env.rs
index 1a5d25ece..97f9d7e3d 100644
--- a/crates/puffin-interpreter/src/virtual_env.rs
+++ b/crates/puffin-interpreter/src/virtual_env.rs
@@ -121,6 +121,7 @@ pub(crate) fn detect_virtual_env(target: &PythonPlatform) -> Result<Option<PathB
             );
             return Ok(Some(PathBuf::from(dir)));
         }
+        (Some(venv), Some(conda)) if venv == conda => return Ok(Some(PathBuf::from(venv))),
         (Some(_), Some(_)) => {
             return Err(Error::Conflict);
         }