From 36035428bc32302a9d7c9ee1ecc833fb8394a2a3 Mon Sep 17 00:00:00 2001 From: pca006132 Date: Wed, 4 Dec 2024 09:07:42 +0800 Subject: [PATCH] run tests for nix (#1094) * run tests for nix * avoid building latest tbb --- flake.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/flake.nix b/flake.nix index 3c999ac2b..8b0a74a2b 100644 --- a/flake.nix +++ b/flake.nix @@ -69,10 +69,6 @@ }) ]; }; - onetbb = pkgs.tbb_2021_11.overrideAttrs (_: { - version = onetbb-src.rev; - src = onetbb-src; - }); gersemi = with pkgs.python3Packages; buildPythonPackage { pname = "gersemi"; version = "0.17.0"; @@ -95,7 +91,7 @@ (python3.withPackages (ps: with ps; [ nanobind trimesh pytest ])) gtest - ]) ++ (if parallel then [ onetbb ] else [ ]); + ]) ++ (if parallel then [ pkgs.tbb_2021_11 ] else [ ]); buildInputs = with pkgs; [ clipper2 assimp @@ -106,6 +102,7 @@ "-DBUILD_SHARED_LIBS=ON" "-DMANIFOLD_PAR=${if parallel then "ON" else "OFF"}" ]; + doCheck = true; checkPhase = '' cd test ./manifold_test @@ -162,7 +159,7 @@ version = manifold-version; src = self; propagatedBuildInputs = [ numpy ]; - buildInputs = [ onetbb pkgs.clipper2 ]; + buildInputs = with pkgs; [ clipper2 tbb_2021_11 ]; nativeBuildInputs = with pkgs; [ cmake ninja @@ -196,7 +193,7 @@ ninja cmake - onetbb + tbb_2021_11 gtest assimp clipper2