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

linuxPackages.perf: fix build with new glibc and remove hack

Browse Source 
elfutils now adds a eu- prefix to avoid collisions
This commit is contained in:
Robin Gloster 2016-08-24 19:19:02 +00:00
parent 5d51614620
commit c26de11551
1 changed files with 2 additions and 5 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

@ -25,18 +25,15 @@ stdenv.mkDerivation {
# binutils is required for libbfd. # binutils is required for libbfd.
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty ]; flex bison libiberty ];
buildInputs = [ python perl newt slang pkgconfig libunwind binutils zlib ] ++ buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++
stdenv.lib.optional withGtk gtk; stdenv.lib.optional withGtk gtk;
# Note: we don't add elfutils to buildInputs, since it provides a # Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff. # bad `ld' and other stuff.
NIX_CFLAGS_COMPILE = "-I${elfutils}/include -Wno-error=cpp -Wno-error=bool-compare"; NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=bool-compare -Wno-error=deprecated-declarations";
NIX_CFLAGS_LINK = "-L${elfutils}/lib";
installFlags = "install install-man ASCIIDOC8=1"; installFlags = "install install-man ASCIIDOC8=1";
inherit elfutils;
crossAttrs = { crossAttrs = {
/* I don't want cross-python or cross-perl - /* I don't want cross-python or cross-perl -
I don't know if cross-python even works */ I don't know if cross-python even works */