diff options
author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix | |
parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix')
-rw-r--r-- | nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix index a339c60e8dfa..0bf5a8e2adb0 100644 --- a/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix +++ b/nixpkgs/pkgs/os-specific/linux/trace-cmd/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xsl, libxslt, libtraceevent, libtracefs }: +{ 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 = "2.9.7"; + 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-04qsTlOVYh/jHVWxaGuqYj4DkUpcEYcpfUqnqhphIMg="; + sha256 = "sha256-zYw6DObwmroAU3ikUNo9XrwQeDlyLppe7E63WFjn44Q="; }; # Don't build and install html documentation @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { Documentation{,/trace-cmd,/libtracecmd}/Makefile ''; - nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto ]; + nativeBuildInputs = [ asciidoc libxslt pkg-config xmlto docbook_xsl docbook_xml_dtd_45 sourceHighlight ]; - buildInputs = [ libtraceevent libtracefs ]; + buildInputs = [ libtraceevent libtracefs zstd ]; outputs = [ "out" "lib" "dev" "man" ]; @@ -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" ]; |