diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-27 12:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 12:01:45 +0000 |
| commit | 86adbaf70c6254cd883a7cfe749691619104f10c (patch) | |
| tree | 29315694eb7bf8539635fe15345ce6c88934322e /pkgs/os-specific | |
| parent | d3e80e4be346dd0c5633a4a85a167c32847554bf (diff) | |
| parent | e0e58321ccacd04e7c9bc5fe77e90903f7ff0a8b (diff) | |
| download | nixlib-86adbaf70c6254cd883a7cfe749691619104f10c.tar nixlib-86adbaf70c6254cd883a7cfe749691619104f10c.tar.gz nixlib-86adbaf70c6254cd883a7cfe749691619104f10c.tar.bz2 nixlib-86adbaf70c6254cd883a7cfe749691619104f10c.tar.lz nixlib-86adbaf70c6254cd883a7cfe749691619104f10c.tar.xz nixlib-86adbaf70c6254cd883a7cfe749691619104f10c.tar.zst nixlib-86adbaf70c6254cd883a7cfe749691619104f10c.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index e4c8be02cbb0..ae028b980ce2 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -78,7 +78,10 @@ stdenv.mkDerivation { patchShebangs pmu-events/jevents.py ''; - makeFlags = [ "prefix=$(out)" "WERROR=0" ] ++ kernel.makeFlags; + makeFlags = [ "prefix=$(out)" "WERROR=0" "ASCIIDOC8=1" ] ++ kernel.makeFlags + ++ lib.optional (!withGtk) "NO_GTK2=1" + ++ lib.optional (!withZstd) "NO_LIBZSTD=1" + ++ lib.optional (!withLibcap) "NO_LIBCAP=1"; hardeningDisable = [ "format" ]; @@ -127,7 +130,7 @@ stdenv.mkDerivation { doCheck = false; # requires "sparse" - installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; + installTargets = [ "install" "install-man" ]; # TODO: Add completions based on perf-completion.sh postInstall = '' |