diff --git a/build_osx_conda.sh b/build_osx_conda.sh
index 2be554c252..23f04c18b7 100755
--- a/build_osx_conda.sh
+++ b/build_osx_conda.sh
@@ -19,6 +19,16 @@ FCENV=freecad_build
 # The cmake build directory
 HOST=$(uname)
 
+###########################################################################
+# Env Checks
+###########################################################################
+which xcrun
+if [ $? != 0 ]; then
+  echo "xcrun not found... install XCode command line tools..."
+  echo "using: xcode-select --install"
+  exit 1
+fi 
+
 ###########################################################################
 # Conda Setup
 ###########################################################################
@@ -47,4 +57,4 @@ if [ $? != 0 ]; then
   fi
 fi
 
-conda build ./conda --channel conda-forge 
\ No newline at end of file
+conda build ./conda --channel conda-forge
\ No newline at end of file
diff --git a/conda/build.sh b/conda/build.sh
index 93e598a08f..7a9c6ff374 100644
--- a/conda/build.sh
+++ b/conda/build.sh
@@ -27,13 +27,16 @@ fi
 if [[ ${HOST} =~ "Darwin" ]]; then
   # add hacks for osx here!
   echo "adding hacks for osx"
-  ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk
+  #ln -s /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk
 
   # install space-mouse
-  curl -o /tmp/3dFW.dmg -L 'https://download.3dconnexion.com/drivers/mac/10-6-6_360DF97D-ED08-4ccf-A55E-0BF905E58476/3DxWareMac_v10-6-6_r3234.dmg'
-  hdiutil attach -readonly /tmp/3dFW.dmg
-  sudo installer -package /Volumes/3Dconnexion\ Software/Install\ 3Dconnexion\ software.pkg -target /
-  diskutil eject /Volumes/3Dconnexion\ Software
+  if [ ! -d "/Library/Frameworks/3DconnexionClient.framework" ]; then
+    echo "Installing 3D connexion space mouse drivers."
+    curl -o /tmp/3dFW.dmg -L 'https://download.3dconnexion.com/drivers/mac/10-6-6_360DF97D-ED08-4ccf-A55E-0BF905E58476/3DxWareMac_v10-6-6_r3234.dmg'
+    hdiutil attach -readonly /tmp/3dFW.dmg
+    sudo installer -package /Volumes/3Dconnexion\ Software/Install\ 3Dconnexion\ software.pkg -target /
+    diskutil eject /Volumes/3Dconnexion\ Software
+  fi
   CMAKE_PLATFORM_FLAGS+=(-DFREECAD_USE_3DCONNEXION:BOOL=ON)
   CMAKE_PLATFORM_FLAGS+=(-D3DCONNEXIONCLIENT_FRAMEWORK:FILEPATH="/Library/Frameworks/3DconnexionClient.framework")
 fi
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 37a5b81af6..0986e1400a 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -8,11 +8,13 @@ package:
     version: {{ version }}
 
 source:
-    git_url: https://github.com/FreeCAD/FreeCAD
-    git_tag: master
+    # JZ - For local building this is the setup. 
+    path: ../
+    #git_url: https://github.com/FreeCAD/FreeCAD
+    #git_tag: master
     patches:
         - windows_python_interface.patch
-        
+
 
 build:
     number: {{ build_number }}