diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-08 16:01:12 +0000 |
commit | 9ee0a9df9bc69e72278b8d34093238428fa3ea82 (patch) | |
tree | 5b074e2ebbc2aba8c957753bfb9e549ed7689585 /pkgs/os-specific/linux/kernel/perf.nix | |
parent | 0b90cd41b2fe467f53d9a082c91e6f6438ba6a2b (diff) | |
parent | 47288a22242b0cd554efc45d446e67573ca308f7 (diff) | |
download | nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.gz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.bz2 nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.lz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.xz nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.tar.zst nixpkgs-9ee0a9df9bc69e72278b8d34093238428fa3ea82.zip |
svn merge ^/nixpkgs/trunk
A few trivial conflicts svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
Diffstat (limited to 'pkgs/os-specific/linux/kernel/perf.nix')
-rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 4b8583dcc95..ba32362b6e8 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,4 +1,5 @@ -{ stdenv, kernel, elfutils }: +{ stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto +, docbook_xsl, docbook_xml_dtd_45, libxslt }: stdenv.mkDerivation { name = "perf-linux-${kernel.version}"; @@ -7,10 +8,25 @@ stdenv.mkDerivation { preConfigure = '' cd tools/perf - export makeFlags="DESTDIR=$out" + sed -i s,/usr/include/elfutils,$elfutils/include/elfutils, Makefile + export makeFlags="DESTDIR=$out $makeFlags" ''; - buildInputs = [ elfutils ]; + # perf refers both to newt and slang + buildNativeInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; + buildInputs = [ elfutils python perl newt slang ]; + + installFlags = "install install-man ASCIIDOC8=1"; + + inherit elfutils; + + crossAttrs = { + /* I don't want cross-python or cross-perl - + I don't know if cross-python even works */ + propagatedBuildInputs = [ elfutils.hostDrv newt.hostDrv ]; + makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-"; + elfutils = elfutils.hostDrv; + }; meta = { homepage = https://perf.wiki.kernel.org/; |