From fc4535b6e8383604046f182431f70b1863ceb066 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 18 Jan 2018 10:40:18 -0600 Subject: [PATCH] Revert "perf: inherit makeFlags from kernel" https://github.com/NixOS/nixpkgs/issues/34013 This reverts commit 92083c3f404620b1e0260946f3330848fdbc1e6b. --- pkgs/os-specific/linux/kernel/perf.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 1936f6578b6..0194099742f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -11,7 +11,7 @@ assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; - inherit (kernel) src makeFlags; + inherit (kernel) src; preConfigure = '' cd tools/perf @@ -39,6 +39,10 @@ stdenv.mkDerivation { "-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" ]; + makeFlags = if stdenv.hostPlatform == stdenv.buildPlatform + then null + else "CROSS_COMPILE=${stdenv.cc.prefix}"; + installFlags = "install install-man ASCIIDOC8=1"; preFixup = ''