trace-cmd: 2.8-0c957d2 -> 2.9-dev-1517dc3

4 files changed, 20 insertions, 21 deletions

diff --git a/pkgs/os-specific/linux/trace-cmd/default.nix b/pkgs/os-specific/linux/trace-cmd/default.nix
index 67f6f9af93e..0759839a9c0 100644
--- a/pkgs/os-specific/linux/trace-cmd/default.nix
+++ b/pkgs/os-specific/linux/trace-cmd/default.nix
@@ -4,7 +4,7 @@ let
   shortRev = builtins.substring 0 7 srcSpec.rev;
 in stdenv.mkDerivation rec {
   name    = "trace-cmd-${version}";
-  version = "2.8-${shortRev}";
+  version = "2.9-dev-${shortRev}";
 
   src = fetchgit srcSpec;
 
@@ -29,6 +29,10 @@ in stdenv.mkDerivation rec {
     "BASH_COMPLETE_DIR=${placeholder "out"}/etc/bash_completion.d"
   ];
 
+  postInstall = ''
+    mv $dev/include/trace-cmd/traceevent $dev/include/traceevent
+  '';
+
   meta = with stdenv.lib; {
     description = "User-space tools for the Linux kernel ftrace subsystem";
     homepage    = http://kernelshark.org/;
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
index 9d0be8b4200..218460eddb3 100644
--- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
@@ -14,10 +14,10 @@ index 21e42fd..b74c912 100644
  clean:
  	(cd $(obj); \
 diff --git a/Makefile b/Makefile
-index cde45f8..d218ecc 100644
+index 3e63e9e..65743c6 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -281,7 +281,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
+@@ -292,7 +292,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
  libtracecmd.a: $(LIBTRACECMD_STATIC)
  libtracecmd.so: $(LIBTRACECMD_SHARED)
  
@@ -26,20 +26,16 @@ index cde45f8..d218ecc 100644
  
  plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir
  	$(Q)$(MAKE) -C $(src)/plugins
-@@ -337,8 +337,12 @@ install_gui: install_cmd gui
+@@ -348,6 +348,8 @@ install_gui: install_cmd gui
  install_libs: libs
  	$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ))
  	$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ))
 +	$(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ))
 +	$(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ))
- 	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ))
-+	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ))
+ 	$(Q)$(call do_install,$(src)/include/traceevent/event-parse.h,$(includedir_SQ)/traceevent)
+ 	$(Q)$(call do_install,$(src)/include/traceevent/trace-seq.h,$(includedir_SQ)/traceevent)
  	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-cmd.h,$(includedir_SQ))
-+	$(Q)$(call do_install,$(src)/include/trace-cmd/trace-filter-hash.h,$(includedir_SQ))
- 
- doc:
- 	$(MAKE) -C $(src)/Documentation all
-@@ -346,6 +350,9 @@ doc:
+@@ -359,6 +361,9 @@ doc:
  doc_clean:
  	$(MAKE) -C $(src)/Documentation clean
  
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index f634746662d..96e237fc459 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -1,4 +1,4 @@
-{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd }:
+{ stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config, doxygen, graphviz }:
 let
   srcSpec = import ./src.nix;
   shortRev = builtins.substring 0 7 srcSpec.rev;
@@ -10,17 +10,16 @@ in mkDerivation rec {
 
   sourceRoot = "trace-cmd-${shortRev}/kernel-shark";
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake doxygen graphviz ];
 
-  buildInputs = [ qtbase json_c mesa_glu freeglut ];
+  buildInputs = [ qtbase json_c mesa_glu freeglut pkg-config ];
 
   cmakeFlags = [
     "-D_INSTALL_PREFIX=${placeholder "out"}"
-    "-DTRACECMD_BIN_DIR=${trace-cmd}/bin"
-    "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include/trace-cmd"
-    "-DTRACECMD_LIBRARY_DIR=${trace-cmd.lib}/lib"
-    "-DTRACEEVENT_INCLUDE_DIR=${trace-cmd.dev}/include/trace-cmd"
-    "-DTRACEEVENT_LIBRARY_DIR=${trace-cmd.lib}/lib"
+    "-DTRACECMD_EXECUTABLE=${trace-cmd}/bin/trace-cmd"
+    "-DTRACECMD_INCLUDE_DIR=${trace-cmd.dev}/include"
+    "-DTRACECMD_LIBRARY=${trace-cmd.lib}/lib/libtracecmd.a"
+    "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a"
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix
index ea239219360..5d5ae0a8c91 100644
--- a/pkgs/os-specific/linux/trace-cmd/src.nix
+++ b/pkgs/os-specific/linux/trace-cmd/src.nix
@@ -1,5 +1,5 @@
 {
   url    = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
-  rev    = "0c957d2d85787350083ac990b35428e665f392a5";
-  sha256 = "1b1d8k5qazm7x6vcprvl9hwsw3kk44pv8wcbgny53rniv7vv22ia";
+  rev    = "1517dc3a15606850b1b52b789cbdeb554e2c68c6";
+  sha256 = "112ccsnza3r3ha8ql733sn256bz0xjhzyw3avbr214r36aag4zrj";
 }