Fix perf version and list optionals

Match perf version with kernel version. Change lib.lists.optionals back to single optional. Signed-off-by: Samuli Leivo <[email protected]>
brianmcgillion · Mar 26, 2024 · 7ceca54 · 7ceca54
1 parent 91e9c29
commit 7ceca54
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/modules/common/development/debug-tools.nix b/modules/common/development/debug-tools.nix
@@ -37,16 +37,13 @@ in
           # Performance testing
           speedtest-cli
           iperf
-
-          # Let's have this fixed version according to kernel.
-          # It would be possible to select also latest producing currently (12-3-2024) perf version 6.6.7
-          # linuxPackages_latest.perf
-          linuxKernel.packages.linux_6_1.perf
+          # Match perf version with kernel.
+          config.boot.kernelPackages.perf
         ]
         # TODO Can this be changed to platformPkgs to filter ?
         # LuaJIT (which is sysbench dependency) not available on RISC-V
-        ++ lib.lists.optionals (config.nixpkgs.hostPlatform.system != "riscv64-linux") [sysbench]
+        ++ lib.optional (config.nixpkgs.hostPlatform.system != "riscv64-linux") sysbench
         # runtimeShell (unixbench dependency) not available on RISC-V nor on cross-compiled Orin AGX/NX
-        ++ lib.lists.optionals (stdenv.hostPlatform == stdenv.buildPlatform) [unixbench];
+        ++ lib.optional (stdenv.hostPlatform == stdenv.buildPlatform) unixbench;
     };
   }