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

tracecmd: 2.8.3 -> 2.9-dev & kernelshark: 0.9.8 -> 1.1.0

Browse Source
This commit is contained in:
Bas van Dijk
2019-10-31 16:07:39 -05:00
committed by Austin Seipp
parent ded2b8a669
commit d6cf06b950
4 changed files with 34 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+8 -7
View File
@@ -1,7 +1,7 @@
{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
{ stdenv, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }:
mkDerivation {
pname = "kernelshark";
version = "0.9.8";
version = "1.1.0";
src = fetchgit (import ./src.nix);
@@ -11,21 +11,22 @@ mkDerivation {
preConfigure = "pushd kernel-shark";
nativeBuildInputs = [ cmake ];
nativeBuildInputs = [ pkg-config cmake asciidoc ];
buildInputs = [ qtbase json_c mesa_glu freeglut pkg-config ];
buildInputs = [ qtbase json_c mesa_glu freeglut ];
cmakeFlags = [
"-D_INSTALL_PREFIX=${placeholder "out"}"
"-DTRACECMD_BIN_DIR=${trace-cmd}/bin"
"-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include"
"-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/libtracecmd.a"
"-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a"
"-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/trace-cmd/libtracecmd.a"
"-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/traceevent/libtraceevent.a"
];
preInstall = ''
popd
make install_gui_docs prefix=$doc
make install_doc_gui prefix=$doc \
FIND_MANPAGE_DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl
pushd kernel-shark/build
'';