From 5c4cd8db3abeec10739ad2128c055e32153c1d30 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 24 May 2025 23:03:10 +0200 Subject: [PATCH 1/2] kissfftFloat: migrate cmakeFeature to cmakeBool --- pkgs/by-name/ki/kissfft/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ki/kissfft/package.nix b/pkgs/by-name/ki/kissfft/package.nix index 03d0e7d04584..985ecb761996 100644 --- a/pkgs/by-name/ki/kissfft/package.nix +++ b/pkgs/by-name/ki/kissfft/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "KISSFFT_DATATYPE" datatype) (lib.cmakeBool "KISSFFT_STATIC" enableStatic) # `test/testkiss.py` expects this… - (lib.cmakeFeature "KISSFFT_OPENMP" (if enableOpenmp then "ON" else "OFF")) + (lib.cmakeBool "KISSFFT_OPENMP" enableOpenmp) ]; # Required for `test/testcpp.c`. From eb222495bcbf7df5b8a7d3929ef05b08b57044e7 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 24 May 2025 23:03:11 +0200 Subject: [PATCH 2/2] vanillara: migrate cmakeFeature to cmakeBool --- pkgs/by-name/va/vanillatd/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/va/vanillatd/package.nix b/pkgs/by-name/va/vanillatd/package.nix index 3864e687d3cf..4b17a2527e1a 100644 --- a/pkgs/by-name/va/vanillatd/package.nix +++ b/pkgs/by-name/va/vanillatd/package.nix @@ -66,10 +66,10 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeFeature "BUILD_VANILLATD" (if appName == "vanillatd" then "ON" else "OFF")) - (lib.cmakeFeature "BUILD_VANILLARA" (if appName == "vanillara" then "ON" else "OFF")) - (lib.cmakeFeature "BUILD_REMASTERTD" (if appName == "remastertd" then "ON" else "OFF")) - (lib.cmakeFeature "BUILD_REMASTERRA" (if appName == "remasterra" then "ON" else "OFF")) + (lib.cmakeBool "BUILD_VANILLATD" (appName == "vanillatd")) + (lib.cmakeBool "BUILD_VANILLARA" (appName == "vanillara")) + (lib.cmakeBool "BUILD_REMASTERTD" (appName == "remastertd")) + (lib.cmakeBool "BUILD_REMASTERRA" (appName == "remasterra")) (lib.cmakeFeature "CMAKE_BUILD_TYPE" CMAKE_BUILD_TYPE) ];