manifold: 3.3.2 -> 3.4.0 (#494851)
This commit is contained in:
@@ -5,27 +5,25 @@
|
||||
cmake,
|
||||
clipper2,
|
||||
gtest,
|
||||
glm,
|
||||
onetbb,
|
||||
python3Packages,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "manifold";
|
||||
version = "3.3.2";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "elalish";
|
||||
repo = "manifold";
|
||||
tag = "v${finalAttrs.version}";
|
||||
hash = "sha256-583/phb0boc5ASFJN+DDn6bogeNPVYPBTgtcD/d/AS8=";
|
||||
hash = "sha256-9h1MLEcqLpiFg8U5rRkR9Qa+ohzehEDCn5rNsN6swlQ=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [
|
||||
gtest
|
||||
glm
|
||||
onetbb
|
||||
];
|
||||
|
||||
@@ -38,13 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
"-DMANIFOLD_PAR=TBB"
|
||||
];
|
||||
|
||||
excludedTestPatterns = lib.optionals stdenv.isDarwin [
|
||||
# https://github.com/elalish/manifold/issues/1306
|
||||
"Manifold.Simplify"
|
||||
excludedTestPatterns = [
|
||||
];
|
||||
doCheck = true;
|
||||
checkPhase = ''
|
||||
test/manifold_test --gtest_filter=-${builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns}
|
||||
test/manifold_test --gtest_filter=-${lib.escapeShellArg (builtins.concatStringsSep ":" finalAttrs.excludedTestPatterns)}
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
|
||||
Reference in New Issue
Block a user