From 039d874f0b93ad10e77995a340b2d3ee55497562 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 16 Nov 2022 12:57:06 +0000 Subject: [PATCH] perf-linux: tweak make flags to supress build warnings --- pkgs/os-specific/linux/kernel/perf/default.nix | 7 +++++-- 1 file 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 = ''