diff options
author | Michal Sojka <michal.sojka@cvut.cz> | 2023-06-17 00:06:38 +0200 |
---|---|---|
committer | Michal Sojka <michal.sojka@cvut.cz> | 2023-06-17 10:27:42 +0200 |
commit | 91785f14b45470636c4f984d49987e5016b1fed7 (patch) | |
tree | c7e87970e9cda3b35d9dd98e266ff29519d10b40 | |
parent | 65a69692469e3efb797e83eae8ae9e2938022347 (diff) | |
download | nixpkgs-91785f14b45470636c4f984d49987e5016b1fed7.tar nixpkgs-91785f14b45470636c4f984d49987e5016b1fed7.tar.gz nixpkgs-91785f14b45470636c4f984d49987e5016b1fed7.tar.bz2 nixpkgs-91785f14b45470636c4f984d49987e5016b1fed7.tar.lz nixpkgs-91785f14b45470636c4f984d49987e5016b1fed7.tar.xz nixpkgs-91785f14b45470636c4f984d49987e5016b1fed7.tar.zst nixpkgs-91785f14b45470636c4f984d49987e5016b1fed7.zip |
libtraceevent: switch to meson build system
Changes/benefits: - Simpler to package - Test are run during package build - HTML documentation added to the doc output
-rw-r--r-- | pkgs/os-specific/linux/libtraceevent/default.nix | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/pkgs/os-specific/linux/libtraceevent/default.nix b/pkgs/os-specific/linux/libtraceevent/default.nix index 9535b405532..5b8aa329b78 100644 --- a/pkgs/os-specific/linux/libtraceevent/default.nix +++ b/pkgs/os-specific/linux/libtraceevent/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, coreutils }: +{ lib, stdenv, fetchgit, pkg-config, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, meson, ninja, cunit }: stdenv.mkDerivation rec { pname = "libtraceevent"; @@ -10,24 +10,18 @@ stdenv.mkDerivation rec { sha256 = "sha256-poF+Cqcdj0KIgEJWW7XDAlRLz2/Egi948s1M24ETvBo="; }; - # 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 --build check-manpages.sh + chmod +x Documentation/install-docs.sh.in + patchShebangs --build check-manpages.sh Documentation/install-docs.sh.in ''; - outputs = [ "out" "dev" "devman" ]; - enableParallelBuilding = true; - nativeBuildInputs = [ pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; - makeFlags = [ - "prefix=${placeholder "out"}" - "doc" # build docs - ]; - installFlags = [ - "pkgconfig_dir=${placeholder "out"}/lib/pkgconfig" - "doc-install" - ]; + outputs = [ "out" "dev" "devman" "doc" ]; + nativeBuildInputs = [ meson ninja pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl ]; + + ninjaFlags = [ "all" "docs" ]; + + doCheck = true; + checkInputs = [ cunit ]; meta = with lib; { description = "Linux kernel trace event library"; |