From 75436e1d553111676900aab6578f8103d5b47bce Mon Sep 17 00:00:00 2001 From: Harinn Date: Wed, 20 May 2026 13:24:52 +0700 Subject: [PATCH] bambu-studio: use lib.cmake* helpers in cmakeFlags (cherry picked from commit c134e4840f95bb86c021720eb3bd51b9fee6220a) --- pkgs/by-name/ba/bambu-studio/package.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index 78b54ad37e48..e4508434282f 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -168,19 +168,19 @@ stdenv.mkDerivation (finalAttrs: { ''; cmakeFlags = [ - "-DSLIC3R_STATIC=0" - "-DSLIC3R_FHS=1" - "-DSLIC3R_GTK=3" + (lib.cmakeBool "SLIC3R_STATIC" false) + (lib.cmakeBool "SLIC3R_FHS" true) + (lib.cmakeFeature "SLIC3R_GTK" "3") # Skips installing ffmpeg, since we BYO. - "-DFLATPAK=1" + (lib.cmakeBool "FLATPAK" true) - # BambuStudio-specific - "-DBBL_RELEASE_TO_PUBLIC=1" - "-DBBL_INTERNAL_TESTING=0" - "-DDEP_WX_GTK3=ON" - "-DSLIC3R_BUILD_TESTS=0" - "-DCMAKE_CXX_FLAGS=-DBOOST_LOG_DYN_LINK" + # Substituted into `#define BBL_x @value@`; must be integer literals. + (lib.cmakeFeature "BBL_RELEASE_TO_PUBLIC" "1") + (lib.cmakeFeature "BBL_INTERNAL_TESTING" "0") + (lib.cmakeBool "DEP_WX_GTK3" true) + (lib.cmakeBool "SLIC3R_BUILD_TESTS" false) + (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DBOOST_LOG_DYN_LINK") ]; preFixup = ''