diff options
| -rw-r--r-- | pkgs/os-specific/linux/trace-cmd/default.nix | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix index f92ed274902..0bf5a8e2adb 100644 --- a/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt, libtraceevent, libtracefs, zstd, sourceHighlight }: stdenv.mkDerivation rec { pname = "trace-cmd"; - version = "3.0.3"; + version = "3.1.1"; src = fetchgit { url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; rev = "trace-cmd-v${version}"; - sha256 = "sha256-28/XEtVlqgD/by0FmvYHAJHKdNi+JHhiM1xPMymuaIY="; + sha256 = "sha256-zYw6DObwmroAU3ikUNo9XrwQeDlyLppe7E63WFjn44Q="; }; # Don't build and install html documentation @@ -27,19 +27,28 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; makeFlags = [ - "all" "libs" "doc" # The following values appear in the generated .pc file "prefix=${placeholder "lib"}" - "libdir=${placeholder "lib"}/lib" - "includedir=${placeholder "dev"}/include" ]; - installTargets = [ "install_cmd" "install_libs" "install_doc" ]; + # We do not mention targets (like "doc") explicitly in makeFlags + # because the Makefile would not print warnings about too old + # libraries (see "warning:" in the Makefile) + postBuild = '' + make libs doc -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES + ''; + + installTargets = [ + "install_cmd" + "install_libs" + "install_doc" + ]; installFlags = [ + "LDCONFIG=false" "bindir=${placeholder "out"}/bin" - "man_dir=${placeholder "man"}/share/man" + "mandir=${placeholder "man"}/share/man" "libdir=${placeholder "lib"}/lib" - "pkgconfig_dir=${placeholder "lib"}/lib/pkgconfig" + "pkgconfig_dir=${placeholder "dev"}/lib/pkgconfig" "includedir=${placeholder "dev"}/include" "BASH_COMPLETE_DIR=${placeholder "out"}/share/bash-completion/completions" ]; |