From c6d7e91f8820bf5d1e60614492bdb1f65d154e08 Mon Sep 17 00:00:00 2001
From: Isuru Fernando <isuruf@gmail.com>
Date: Fri, 26 Apr 2024 11:49:28 -0500
Subject: [PATCH] simplify dependencies

---
 recipe/.meta.yaml.swp   | Bin 16384 -> 0 bytes
 recipe/build_openmm.bat |   4 ++--
 recipe/build_openmm.sh  |   4 ++--
 recipe/meta.yaml        |  11 ++++-------
 4 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 recipe/.meta.yaml.swp

diff --git a/recipe/.meta.yaml.swp b/recipe/.meta.yaml.swp
deleted file mode 100644
index 21ee0b842fadfaceff1a6abc692152148e1ace94..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

diff --git a/recipe/build_openmm.bat b/recipe/build_openmm.bat
index a2d9db4..76a3983 100644
--- a/recipe/build_openmm.bat
+++ b/recipe/build_openmm.bat
@@ -40,7 +40,7 @@ dir dist
 for %%f in (dist\*.whl) do (
   echo "fixing %%f"
   cd %LIBRARY_PREFIX%
-  %PYTHON% ^
+  %BUILD_PREFIX%\python.exe ^
       %RECIPE_DIR%\vendor_wheel.py ^
       %SRC_DIR%\build\python\%%f ^
       include\openmm ^
@@ -72,7 +72,7 @@ cd %SRC_DIR%\build\python
 for %%f in (dist\*.whl) do (
   echo "fixing %%f"
   cd %LIBRARY_PREFIX%
-  %PYTHON% ^
+  %BUILD_PREFIX%\python.exe ^
       %RECIPE_DIR%\vendor_wheel.py ^
       %SRC_DIR%\build\python\%%f ^
       lib\plugins\OpenMMCUDA.dll ^
diff --git a/recipe/build_openmm.sh b/recipe/build_openmm.sh
index f3d1bdf..7571836 100644
--- a/recipe/build_openmm.sh
+++ b/recipe/build_openmm.sh
@@ -103,7 +103,7 @@ for whl in $PWD/dist/*.whl; do
         plugins="$plugins $plugin"
       fi
     done
-    $PREFIX/bin/python \
+    $BUILD_PREFIX/bin/python${PY_VER} $(which delocate-wheel) \
       $RECIPE_DIR/vendor_wheel.py \
       $whl \
       include/openmm \
@@ -145,7 +145,7 @@ function repair() {
       --exclude libnvrtc.so.12 \
       --lib-sdir=$LIB_SDIR
   else
-    $PYTHON $(which delocate-wheel) \
+    $BUILD_PREFIX/bin/python${PY_VER} $(which delocate-wheel) \
       -w fixed_wheels \
       --sanitize-rpaths \
       -v \
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index cb86d21..4821cb0 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -64,6 +64,10 @@ requirements:
     # START WHEEL CHANGES
     - unzip           # [unix]
     - patchelf        # [linux]
+    - auditwheel      # [linux]
+    - setuptools      # [linux]
+    - delocate >=0.10.6
+    - pip
     # END WHEEL CHANGES
 
   host:
@@ -86,13 +90,6 @@ requirements:
     # No cuda-driver-dev in windows
     - cuda-driver-dev  # [linux]
     {% endif %}
-    # START WHEEL CHANGES
-    - auditwheel      # [linux]
-    - setuptools      # [linux]
-    - delocate >=0.10.6
-    - pip
-    - macholib
-    # END WHEEL CHANGES
   run:
     - python
     - numpy