Unverified Commit 0c74ec66 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

treewide: migrate cmakeFeature to cmakeBool (#410626)

parents d699135d eb222495

pkgs/by-name/ki/kissfft/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -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`.

pkgs/by-name/va/vanillatd/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -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)

  ];