From e1588ea3fb5fdb31562f697ee88e9f9987821225 Mon Sep 17 00:00:00 2001
From: Clifford Yapp <238416+starseeker@users.noreply.github.com>
Date: Sat, 28 Sep 2024 13:24:06 -0400
Subject: [PATCH] Hmm - looks like flake naming was coming from MANIFOLD_PAR -
 try translating the settings.

---
 CMakeLists.txt | 9 +++++++++
 flake.nix      | 6 +++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0f6b3476..2e086e2cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,15 @@ set(MANIFOLD_VERSION_MINOR 5)
 set(MANIFOLD_VERSION_PATCH 1)
 set(MANIFOLD_VERSION "${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}")
 
+# Correct MANIFOLD_PAR values to on/off (previous NONE/TBB values should still
+# work this way)
+if (DEFINED MANIFOLD_PAR)
+  if ("${MANIFOLD_PAR}" STREQUAL "" OR "${MANIFOLD_PAR}" STREQUAL "NONE")
+    set(MANIFOLD_PAR OFF CACHE BOOL "Normalized MANIFOLD_PAR setting")
+  else()
+    set(MANIFOLD_PAR ON CACHE BOOL "Normalized MANIFOLD_PAR setting")
+  endif ()
+endif ()
 
 # Primary user facing options
 option(MANIFOLD_CROSS_SECTION "Build CrossSection for 2D support" ON)
diff --git a/flake.nix b/flake.nix
index 9a15fc5be..995a4208c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,7 +22,7 @@
             src = clipper2-src;
           });
           manifold =
-            { parallel-backend ? "off"
+            { parallel-backend ? "none"
             , doCheck ? true
             , build-tools ? [ ]
             , ...
@@ -60,9 +60,9 @@
               '';
             };
           parallelBackends = [
-            { parallel-backend = "off"; }
+            { parallel-backend = "none"; }
             {
-              parallel-backend = "on";
+              parallel-backend = "tbb";
               build-tools = with pkgs; [ tbb pkg-config ];
             }
           ];