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

linuxPackages.perf: fix tips.txt lookup, few extra deps

Browse Source 
Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2018-02-19 23:17:02 -06:00
parent 825ff649b5
commit f0fe7bae99
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper
, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
, libiberty, libaudit, libbfd , libiberty, libaudit, libbfd, openssl, systemtap, numactl
, zlib, withGtk ? false, gtk2 ? null }: , zlib, withGtk ? false, gtk2 ? null
}:
with lib; with lib;
@ -17,14 +18,16 @@ stdenv.mkDerivation {
cd tools/perf cd tools/perf
sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile
[ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion [ -f bash_completion ] && sed -i 's,^have perf,_have perf,' bash_completion
export makeFlags="DESTDIR=$out $makeFlags" export makeFlags="DESTDIR=$out WERROR=0 $makeFlags"
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -DTIPDIR=\"$out/share/doc/perf-tip\""
''; '';
# perf refers both to newt and slang # perf refers both to newt and slang
nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
flex bison libiberty libaudit makeWrapper pkgconfig python perl ]; flex bison libiberty libaudit makeWrapper pkgconfig python perl ];
buildInputs = [ elfutils newt slang libunwind libbfd zlib ] ++ buildInputs =
stdenv.lib.optional withGtk gtk2; [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
] ++ stdenv.lib.optional withGtk gtk2;
# 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.