Merge NixOS#217218: linux: fix-build on i686

sgeisenh · Feb 20, 2023 · b69883f · b69883f
2 parents 0336db7 + 743bd1f
commit b69883f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -71,13 +71,13 @@ let
       PM_WAKELOCKS                     = yes;
       POWERCAP                         = yes;
       # ACPI Firmware Performance Data Table Support
-      ACPI_FPDT                        = whenAtLeast "5.12" yes;
+      ACPI_FPDT                        = whenAtLeast "5.12" (option yes);
       # ACPI Heterogeneous Memory Attribute Table Support
-      ACPI_HMAT                        = whenAtLeast "5.2" yes;
+      ACPI_HMAT                        = whenAtLeast "5.2" (option yes);
       # ACPI Platform Error Interface
-      ACPI_APEI                        = yes;
+      ACPI_APEI                        = (option yes);
       # APEI Generic Hardware Error Source
-      ACPI_APEI_GHES                   = yes;
+      ACPI_APEI_GHES                   = (option yes);
     } // optionalAttrs (stdenv.hostPlatform.isx86) {
       INTEL_IDLE                       = yes;
       INTEL_RAPL                       = whenAtLeast "5.3" module;