From 393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 12 Sep 2021 23:11:02 +0200 Subject: [PATCH] kernelshark: 1.2 -> 2.0.2 Relevant upstream changes: - Sources were moved from trace-cmd repository to a new repository. - Makefile for building documentation is broken. Therefore, we don't build documentation. After upstream fixes it, we can build it again. --- .../linux/trace-cmd/kernelshark.nix | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 45d984c78632..4d0412edbeee 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,40 +1,31 @@ -{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: +{ lib, mkDerivation, fetchgit, qtbase, cmake, asciidoc +, docbook_xsl, json_c, mesa_glu, freeglut, trace-cmd, pkg-config +, libtraceevent, libtracefs, freefont_ttf +}: + mkDerivation rec { pname = "kernelshark"; - version = "1.2"; + version = "2.0.2"; src = fetchgit { - url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/"; - rev = "kernelshark-v${version}"; - sha256 = "0wzzm2imk9n94v96v6sbvbff6j47lz4qj0snhiyv3nj3slg0anvh"; + url = "https://git.kernel.org/pub/scm/utils/trace-cmd/kernel-shark.git/"; + rev = "kernelshark-v${version}"; + sha256 = "0vy5wa1kccrxr973l870jy5hl6lac7sk3zyg3hxrwmivin1yf0cv"; }; - patches = [ ./fix-Makefiles.patch ]; + outputs = [ "out" ]; - outputs = [ "out" "doc" ]; + nativeBuildInputs = [ pkg-config cmake ]; - preConfigure = "pushd kernel-shark"; - - nativeBuildInputs = [ pkg-config cmake asciidoc ]; - - buildInputs = [ qtbase json_c mesa_glu freeglut ]; + buildInputs = [ qtbase json_c mesa_glu freeglut libtraceevent libtracefs trace-cmd ]; 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/trace-cmd/libtracecmd.a" - "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/traceevent/libtraceevent.a" - "-DTRACEFS_LIBRARY=${trace-cmd.lib}/lib/tracefs/libtracefs.a" + "-D_POLKIT_INSTALL_PREFIX=${placeholder "out"}" + "-DPKG_CONGIG_DIR=${placeholder "out"}/lib/pkgconfig" + "-DTT_FONT_FILE=${freefont_ttf}/share/fonts/truetype/FreeSans.ttf" ]; - preInstall = '' - popd - make install_doc_gui prefix=$doc \ - FIND_MANPAGE_DOCBOOK_XSL=${docbook_xsl}/share/xml/docbook-xsl-nons/manpages/docbook.xsl - pushd kernel-shark/build - ''; - meta = with lib; { description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem"; homepage = "https://kernelshark.org/";