linuxKernels.kernels.linux_xanmod: apply patch from review

1 files changed, 36 insertions, 34 deletions

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index a0bf4b84e07..205a5260840 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -14,7 +14,6 @@ let
   };
 
   xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec {
-  with (lib.kernel.whenHelpers version);
     inherit version;
     modDirVersion = "${version}-${suffix}";
 
@@ -25,48 +24,51 @@ let
       inherit hash;
     };
 
-    structuredExtraConfig = with lib.kernel; {
-      # removed options
-      CFS_BANDWIDTH = lib.mkForce (option no);
-      RT_GROUP_SCHED = lib.mkForce (option no);
-      SCHED_AUTOGROUP = lib.mkForce (option no);
+    structuredExtraConfig =
+      with lib.kernel;
+      with (lib.kernel.whenHelpers version);
+      {
+        # removed options
+        CFS_BANDWIDTH = lib.mkForce (option no);
+        RT_GROUP_SCHED = lib.mkForce (option no);
+        SCHED_AUTOGROUP = lib.mkForce (option no);
 
-      # AMD P-state driver
-      X86_AMD_PSTATE = yes;
+        # AMD P-state driver
+        X86_AMD_PSTATE = yes;
 
-      # Linux RNG framework
-      LRNG = whenOlder "5.18" yes;
+        # Linux RNG framework
+        LRNG = whenOlder "5.18" yes;
 
-      # Paragon's NTFS3 driver
-      NTFS3_FS = module;
-      NTFS3_LZX_XPRESS = yes;
-      NTFS3_FS_POSIX_ACL = yes;
+        # Paragon's NTFS3 driver
+        NTFS3_FS = module;
+        NTFS3_LZX_XPRESS = yes;
+        NTFS3_FS_POSIX_ACL = yes;
 
-      # Preemptive Full Tickless Kernel at 500Hz
-      SCHED_CORE = lib.mkForce (option no);
-      PREEMPT_VOLUNTARY = lib.mkForce no;
-      PREEMPT = lib.mkForce yes;
-      NO_HZ_FULL = yes;
-      HZ_500 = yes;
+        # Preemptive Full Tickless Kernel at 500Hz
+        SCHED_CORE = lib.mkForce (option no);
+        PREEMPT_VOLUNTARY = lib.mkForce no;
+        PREEMPT = lib.mkForce yes;
+        NO_HZ_FULL = yes;
+        HZ_500 = yes;
 
-      # Google's BBRv2 TCP congestion Control
-      TCP_CONG_BBR2 = yes;
-      DEFAULT_BBR2 = yes;
+        # Google's BBRv2 TCP congestion Control
+        TCP_CONG_BBR2 = yes;
+        DEFAULT_BBR2 = yes;
 
-      # FQ-PIE Packet Scheduling
-      NET_SCH_DEFAULT = yes;
-      DEFAULT_FQ_PIE = yes;
+        # FQ-PIE Packet Scheduling
+        NET_SCH_DEFAULT = yes;
+        DEFAULT_FQ_PIE = yes;
 
-      # Graysky's additional CPU optimizations
-      CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
+        # Graysky's additional CPU optimizations
+        CC_OPTIMIZE_FOR_PERFORMANCE_O3 = yes;
 
-      # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
-      FUTEX = yes;
-      FUTEX_PI = yes;
+        # Futex WAIT_MULTIPLE implementation for Wine / Proton Fsync.
+        FUTEX = yes;
+        FUTEX_PI = yes;
 
-      # WineSync driver for fast kernel-backed Wine
-      WINESYNC = module;
-    };
+        # WineSync driver for fast kernel-backed Wine
+        WINESYNC = module;
+      };
 
     extraMeta = {
       branch = lib.versions.majorMinor version;