summary refs log tree commit diff
path: root/pkgs/os-specific/linux/trace-cmd
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2019-07-25 22:13:17 +0200
committerBas van Dijk <v.dijk.bas@gmail.com>2019-07-25 22:13:17 +0200
commit585de35cd6db1123b547c792a1c7d509d6657edb (patch)
treef02657db43309efb0fd945f437b09cfb82a295a2 /pkgs/os-specific/linux/trace-cmd
parent4542cca0b21d019ff428093c308a10426ed91228 (diff)
downloadnixpkgs-585de35cd6db1123b547c792a1c7d509d6657edb.tar
nixpkgs-585de35cd6db1123b547c792a1c7d509d6657edb.tar.gz
nixpkgs-585de35cd6db1123b547c792a1c7d509d6657edb.tar.bz2
nixpkgs-585de35cd6db1123b547c792a1c7d509d6657edb.tar.lz
nixpkgs-585de35cd6db1123b547c792a1c7d509d6657edb.tar.xz
nixpkgs-585de35cd6db1123b547c792a1c7d509d6657edb.tar.zst
nixpkgs-585de35cd6db1123b547c792a1c7d509d6657edb.zip
kernelshark: install documentation
Diffstat (limited to 'pkgs/os-specific/linux/trace-cmd')
-rw-r--r--pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch15
-rw-r--r--pkgs/os-specific/linux/trace-cmd/kernelshark.nix12
2 files changed, 21 insertions, 6 deletions
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
index 218460eddb3..0bf9f501ca3 100644
--- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
+++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch
@@ -1,20 +1,22 @@
 diff --git a/Documentation/Makefile b/Documentation/Makefile
-index 21e42fd..b74c912 100644
+index 21e42fd..826361d 100644
 --- a/Documentation/Makefile
 +++ b/Documentation/Makefile
-@@ -108,7 +108,9 @@ $(IMGS_INSTALL): %.png.install : %.png force
+@@ -108,7 +108,11 @@ $(IMGS_INSTALL): %.png.install : %.png force
  
  GUI_INSTALL = $(HTML_INSTALL) $(IMGS_INSTALL)
  
 -install: $(MAN1_INSTALL) $(MAN5_INSTALL) $(GUI_INSTALL)
 +install_man: $(MAN1_INSTALL) $(MAN5_INSTALL)
 +
-+install: install_man $(GUI_INSTALL)
++install_gui: $(GUI_INSTALL)
++
++install: install_man install_gui
  
  clean:
  	(cd $(obj); \
 diff --git a/Makefile b/Makefile
-index 3e63e9e..65743c6 100644
+index 3e63e9e..146fe88 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -292,7 +292,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC)
@@ -35,13 +37,16 @@ index 3e63e9e..65743c6 100644
  	$(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))
-@@ -359,6 +361,9 @@ doc:
+@@ -359,6 +361,12 @@ doc:
  doc_clean:
  	$(MAKE) -C $(src)/Documentation clean
  
 +install_man:
 +	$(MAKE) -C $(src)/Documentation install_man
 +
++install_gui_docs:
++	$(MAKE) -C $(src)/Documentation install_gui
++
  install_doc:
  	$(MAKE) -C $(src)/Documentation install
  
diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
index 96e237fc459..2ca6eff2608 100644
--- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
+++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix
@@ -8,7 +8,11 @@ in mkDerivation rec {
 
   src = fetchgit srcSpec;
 
-  sourceRoot = "trace-cmd-${shortRev}/kernel-shark";
+  patches = [ ./fix-Makefiles.patch ];
+
+  outputs = [ "out" "doc" ];
+
+  preConfigure = "pushd kernel-shark";
 
   nativeBuildInputs = [ cmake doxygen graphviz ];
 
@@ -22,6 +26,12 @@ in mkDerivation rec {
     "-DTRACEEVENT_LIBRARY=${trace-cmd.lib}/lib/libtraceevent.a"
   ];
 
+  preInstall = ''
+    popd
+    make install_gui_docs prefix=$doc
+    pushd kernel-shark/build
+  '';
+
   meta = with stdenv.lib; {
     description = "GUI for trace-cmd which is an interface for the Linux kernel ftrace subsystem";
     homepage    = http://kernelshark.org/;