public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "perf: inherit makeFlags from kernel"

Browse Source 
https://github.com/NixOS/nixpkgs/issues/34013

This reverts commit 92083c3f404620b1e0260946f3330848fdbc1e6b.
This commit is contained in:
Will Dietz 2018-01-18 10:40:18 -06:00
parent e1db0afd61
commit fc4535b6e8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/kernel/perf.nix
View File

@ -11,7 +11,7 @@ assert versionAtLeast kernel.version "3.12";
stdenv.mkDerivation { stdenv.mkDerivation {
name = "perf-linux-${kernel.version}"; name = "perf-linux-${kernel.version}";
inherit (kernel) src makeFlags; inherit (kernel) src;
preConfigure = '' preConfigure = ''
cd tools/perf cd tools/perf
@ -39,6 +39,10 @@ stdenv.mkDerivation {
"-Wno-error=unused-const-variable" "-Wno-error=misleading-indentation" "-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"; installFlags = "install install-man ASCIIDOC8=1";
preFixup = '' preFixup = ''