Merge pull request #1849 from McStasMcXtrace/ncrystal-4-patches

Ncrystal 4 patches - remove from cross-compile build
mccode-dev · Feb 10, 2025 · 04da981 · 04da981
2 parents c3fe746 + a4f8ce0
commit 04da981
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/buildscripts/build_windows_mcstas b/buildscripts/build_windows_mcstas
@@ -57,6 +57,7 @@ export MCCODE_USE_LEGACY_DESTINATIONS=ON
 ./mkdist mcstas-tools-python-mcdisplay-cad $1 tools/Python/mcdisplay/cad/ "" mingw64 "" -- nsis64
 ./mkdist mcstas-manuals $1 docpkg/manuals/mcstas/ "" mingw64 "" -- nsis64
 ./mkdist mcstas-tools-python-mcdoc $1 tools/Python/mcdoc/ "" mingw64 "" -- nsis64
+./mkdist mcstas-ncrystal $1 3rdparty/ncrystal-package "" mingw64 "" -- nsis64
 ./mkdist mcstas-mcpl $1 3rdparty/mcpl-package "" mingw64 "" -- nsis64
 
 if [ "x$2" != "x" ]; then

diff --git a/meta-pkgs/windows/environment.yml b/meta-pkgs/windows/environment.yml
@@ -26,7 +26,6 @@ dependencies:
   - nexpy
   - hdf5
   - xraylib
-  - ncrystal
   - jupytext
   - jupyterlab
   - ipympl
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ dependencies: @@
       - nexpy
       - hdf5
       - xraylib
-      - ncrystal
       - jupytext
       - jupyterlab
       - ipympl
@@ Expand Down @@