Skip to content

Commit

Permalink
run tests for nix (#1094)
Browse files Browse the repository at this point in the history
* run tests for nix

* avoid building latest tbb
  • Loading branch information
pca006132 authored Dec 4, 2024
1 parent f1a8693 commit 3603542
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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
Expand All @@ -106,6 +102,7 @@
"-DBUILD_SHARED_LIBS=ON"
"-DMANIFOLD_PAR=${if parallel then "ON" else "OFF"}"
];
doCheck = true;
checkPhase = ''
cd test
./manifold_test
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -196,7 +193,7 @@

ninja
cmake
onetbb
tbb_2021_11
gtest
assimp
clipper2
Expand Down

0 comments on commit 3603542

Please sign in to comment.