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

Merge pull request #9643 from dezgeg/pr-perf

Browse Source 
linuxPackages_*.perf: Fix build after kernel 4.1
This commit is contained in:
William A. Kennington III 2015-09-03 20:24:11 -07:00
commit 0754a213c1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,10 +23,13 @@ stdenv.mkDerivation {
# perf refers both to newt and slang
# binutils is required for libbfd.
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison ];
buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils ] ++
buildInputs = [ python perl newt slang pkgconfig libunwind binutils ] ++
stdenv.lib.optional withGtk gtk;
NIX_CFLAGS_COMPILE = "-Wno-error=cpp";
# Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff.
NIX_CFLAGS_COMPILE = "-I${elfutils}/include -Wno-error=cpp";
NIX_CFLAGS_LINK = "-L${elfutils}/lib";
installFlags = "install install-man ASCIIDOC8=1";