update

pca006132 · Aug 24, 2023 · 777e228 · 777e228
1 parent 347fc1c
commit 777e228
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/flake.nix b/flake.nix
@@ -101,6 +101,34 @@
                 cp {extras,wasm}/*.wasm $out/
               '';
             };
+            # but how should we make it work with other python versions?
+            manifold3d = with pkgs.python3Packages; buildPythonPackage {
+              pname = "manifold3d";
+              version = "2.2.0";
+              src = self;
+              propagatedBuildInputs = [
+                numpy
+              ];
+              buildInputs = with pkgs; [
+                tbb
+              ];
+              nativeBuildInputs = with pkgs; [
+                cmake
+                ninja
+                setuptools
+                scikit-build
+                pkg-config
+              ];
+              checkInputs = [
+                trimesh
+              ];
+              format = "pyproject";
+              dontUseCmakeConfigure = true;
+              doCheck = true;
+              checkPhase = ''
+                python3 bindings/python/examples/run_all.py
+              '';
+            };
           };
           devShell = devShell { };
         }

diff --git a/pyproject.toml b/pyproject.toml
@@ -16,7 +16,7 @@ classifiers = [
 requires-python = ">=3.7"
 
 dependencies = [
-    "oldest-supported-numpy; python_version<'3.12'",
+    "numpy; python_version<'3.12'",
     "numpy>=1.26.0b1; python_version>='3.12'"
 ]