summary refs log tree commit diff
path: root/pkgs/os-specific/linux/trace-cmd
diff options
context:
space:
mode:
authorMichal Sojka <michal.sojka@cvut.cz>2021-09-12 23:11:02 +0200
committerMichal Sojka <michal.sojka@cvut.cz>2021-10-23 22:19:10 +0200
commit393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee (patch)
tree3080f99c3f78ef6f686c45b2f79def3dab52f72f /pkgs/os-specific/linux/trace-cmd
parent3d249d1d49c6eb35d14f812ee40a6cbb6b8aa7b3 (diff)
downloadnixpkgs-393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee.tar
nixpkgs-393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee.tar.gz
nixpkgs-393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee.tar.bz2
nixpkgs-393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee.tar.lz
nixpkgs-393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee.tar.xz
nixpkgs-393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee.tar.zst
nixpkgs-393fc1f7ee8204aa335e57e4b8bea9dccf24d4ee.zip
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.
Diffstat (limited to 'pkgs/os-specific/linux/trace-cmd')
-rw-r--r--pkgs/os-specific/linux/trace-cmd/kernelshark.nix39
1 files 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 45d984c7863..4d0412edbee 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" "doc" ];
+  outputs = [ "out" ];
 
-  preConfigure = "pushd kernel-shark";
+  nativeBuildInputs = [ pkg-config cmake ];
 
-  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/";