diff options
author | Austin Seipp <aseipp@pobox.com> | 2018-02-19 23:17:02 -0600 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2018-02-20 07:00:21 -0600 |
commit | f0fe7bae99ebe7b23a231738352ca7d196917747 (patch) | |
tree | 8740c2c8907f68e0be9536889e0505a433a061fe /pkgs/os-specific/linux/kernel | |
parent | 825ff649b59ac3a7aa2ecb099c5f5c655f260178 (diff) | |
download | nixlib-f0fe7bae99ebe7b23a231738352ca7d196917747.tar nixlib-f0fe7bae99ebe7b23a231738352ca7d196917747.tar.gz nixlib-f0fe7bae99ebe7b23a231738352ca7d196917747.tar.bz2 nixlib-f0fe7bae99ebe7b23a231738352ca7d196917747.tar.lz nixlib-f0fe7bae99ebe7b23a231738352ca7d196917747.tar.xz nixlib-f0fe7bae99ebe7b23a231738352ca7d196917747.tar.zst nixlib-f0fe7bae99ebe7b23a231738352ca7d196917747.zip |
linuxPackages.perf: fix tips.txt lookup, few extra deps
Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 1936f6578b6f..8090a7329aee 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,7 +1,8 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils -, libiberty, libaudit, libbfd -, zlib, withGtk ? false, gtk2 ? null }: +, libiberty, libaudit, libbfd, openssl, systemtap, numactl +, zlib, withGtk ? false, gtk2 ? null +}: with lib; @@ -17,14 +18,16 @@ stdenv.mkDerivation { cd tools/perf sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile [ -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 nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt flex bison libiberty libaudit makeWrapper pkgconfig python perl ]; - buildInputs = [ elfutils newt slang libunwind libbfd zlib ] ++ - stdenv.lib.optional withGtk gtk2; + buildInputs = + [ 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 # bad `ld' and other stuff. |