arm64: skip perf tools
doesn't build on the custome kernel
This commit is contained in:
parent
c001078e56
commit
d4a6e36fd1
@ -32,6 +32,11 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
username = lib.mkOption {type = str;};
|
username = lib.mkOption {type = str;};
|
||||||
|
|
||||||
|
skipPerf = lib.mkOption {
|
||||||
|
type = bool;
|
||||||
|
default = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
@ -83,7 +88,9 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = with pkgs; [
|
systemPackages = with pkgs;
|
||||||
|
lib.mkMerge [
|
||||||
|
[
|
||||||
jc # parse different formats and command outputs to json
|
jc # parse different formats and command outputs to json
|
||||||
jq # parse, format and query json documents
|
jq # parse, format and query json documents
|
||||||
pv # pipe viewer for progressbars in pipes
|
pv # pipe viewer for progressbars in pipes
|
||||||
@ -155,7 +162,6 @@ in {
|
|||||||
bandwhich
|
bandwhich
|
||||||
speedtest-cli
|
speedtest-cli
|
||||||
nix-output-monitor
|
nix-output-monitor
|
||||||
config.boot.kernelPackages.perf
|
|
||||||
|
|
||||||
# compression/decompression
|
# compression/decompression
|
||||||
xz
|
xz
|
||||||
@ -164,6 +170,8 @@ in {
|
|||||||
p7zip
|
p7zip
|
||||||
zopfli
|
zopfli
|
||||||
brotli
|
brotli
|
||||||
|
]
|
||||||
|
(lib.mkIf (!cfg.skipPerf) config.boot.kernelPackages.perf)
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -8,6 +8,8 @@
|
|||||||
crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform;
|
crossFast = pkgs.crossArm64.pkgsCross.aarch64-multiplatform;
|
||||||
crossNative = pkgs.pkgsCross.aarch64-multiplatform;
|
crossNative = pkgs.pkgsCross.aarch64-multiplatform;
|
||||||
in {
|
in {
|
||||||
|
mj.skipPerf = true;
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec {
|
kernelPackages = crossNative.linuxPackagesFor (crossFast.buildLinux rec {
|
||||||
version = "6.8.0-rc7";
|
version = "6.8.0-rc7";
|
||||||
|
Loading…
Reference in New Issue
Block a user