diff --git a/pkgs/os-specific/linux/libtracefs/default.nix b/pkgs/os-specific/linux/libtracefs/default.nix index f3f1a393973..972a71d5039 100644 --- a/pkgs/os-specific/linux/libtracefs/default.nix +++ b/pkgs/os-specific/linux/libtracefs/default.nix @@ -1,23 +1,36 @@ -{ lib, stdenv, fetchgit, pkg-config, libtraceevent, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl }: +{ lib +, stdenv +, fetchgit +, pkg-config +, libtraceevent +, asciidoc +, xmlto +, docbook_xml_dtd_45 +, docbook_xsl +, coreutils +, which +, valgrind +, sourceHighlight +}: stdenv.mkDerivation rec { pname = "libtracefs"; - version = "1.2.5"; + version = "1.3.0"; src = fetchgit { url = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git"; rev = "libtracefs-${version}"; - sha256 = "1rva9ysspf1wqd0zf52qwgpaasrn7jcbns4dwldc59ksk0n93qdb"; + sha256 = "sha256-Kg1mPjTZ2UCeco18Fa8GqmLo2R35XvUE/q2J1HAmtEc="; }; - # Don't build and install html documentation postPatch = '' - sed -i -e '/^all:/ s/html//' -e '/^install:/ s/install-html//' Documentation/Makefile + substituteInPlace scripts/utils.mk --replace /bin/pwd ${coreutils}/bin/pwd + patchShebangs check-manpages.sh ''; - outputs = [ "out" "dev" "devman" ]; + outputs = [ "out" "dev" "devman" "doc" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl which valgrind sourceHighlight ]; buildInputs = [ libtraceevent ]; makeFlags = [ "prefix=${placeholder "out"}"