diff options
| author | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-07-27 20:02:58 +0200 |
|---|---|---|
| committer | Bas van Dijk <v.dijk.bas@gmail.com> | 2019-07-27 20:02:58 +0200 |
| commit | 7803c04c7c5b1dd9d387501727ed12573218e54d (patch) | |
| tree | d29f5e789cc77fe1bb1fe4d78f1b7907ed6b4fa6 /pkgs/os-specific | |
| parent | d9e3118ab00c2d60159902acbd3514e35fdbd8bf (diff) | |
| download | nixpkgs-7803c04c7c5b1dd9d387501727ed12573218e54d.tar nixpkgs-7803c04c7c5b1dd9d387501727ed12573218e54d.tar.gz nixpkgs-7803c04c7c5b1dd9d387501727ed12573218e54d.tar.bz2 nixpkgs-7803c04c7c5b1dd9d387501727ed12573218e54d.tar.lz nixpkgs-7803c04c7c5b1dd9d387501727ed12573218e54d.tar.xz nixpkgs-7803c04c7c5b1dd9d387501727ed12573218e54d.tar.zst nixpkgs-7803c04c7c5b1dd9d387501727ed12573218e54d.zip | |
kernelshark: 0.9.8-f97e28a -> 1.0.0
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch | 21 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/trace-cmd/kernelshark.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/trace-cmd/src.nix | 4 |
3 files changed, 22 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch index 0bf9f501ca3..547e6385bb6 100644 --- a/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch +++ b/pkgs/os-specific/linux/trace-cmd/fix-Makefiles.patch @@ -16,10 +16,10 @@ index 21e42fd..826361d 100644 clean: (cd $(obj); \ diff --git a/Makefile b/Makefile -index 3e63e9e..146fe88 100644 +index 3afd982..8dd55ba 100644 --- a/Makefile +++ b/Makefile -@@ -292,7 +292,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC) +@@ -293,7 +293,7 @@ libtraceevent.a: $(LIBTRACEEVENT_STATIC) libtracecmd.a: $(LIBTRACECMD_STATIC) libtracecmd.so: $(LIBTRACECMD_SHARED) @@ -28,7 +28,7 @@ index 3e63e9e..146fe88 100644 plugins: force $(obj)/plugins/trace_plugin_dir $(obj)/plugins/trace_python_dir $(Q)$(MAKE) -C $(src)/plugins -@@ -348,6 +348,8 @@ install_gui: install_cmd gui +@@ -349,6 +349,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)) @@ -37,7 +37,7 @@ index 3e63e9e..146fe88 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,12 @@ doc: +@@ -360,6 +362,12 @@ doc: doc_clean: $(MAKE) -C $(src)/Documentation clean @@ -50,3 +50,16 @@ index 3e63e9e..146fe88 100644 install_doc: $(MAKE) -C $(src)/Documentation install +diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt +index 21494cc..d91c365 100644 +--- a/kernel-shark/src/CMakeLists.txt ++++ b/kernel-shark/src/CMakeLists.txt +@@ -93,7 +93,7 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND) + DESTINATION ${_INSTALL_PREFIX}/share/icons/${KS_APP_NAME}) + + install(FILES "${KS_DIR}/org.freedesktop.kshark-record.policy" +- DESTINATION /usr/share/polkit-1/actions/) ++ DESTINATION ${_INSTALL_PREFIX}/share/polkit-1/actions/) + + install(PROGRAMS "${KS_DIR}/bin/kshark-su-record" + DESTINATION ${_INSTALL_PREFIX}/bin/) diff --git a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix index 7cf8c98335f..d220fe55672 100644 --- a/pkgs/os-specific/linux/trace-cmd/kernelshark.nix +++ b/pkgs/os-specific/linux/trace-cmd/kernelshark.nix @@ -1,12 +1,9 @@ { stdenv, mkDerivation, fetchgit, qtbase, cmake, json_c, mesa_glu, freeglut, trace-cmd, pkg-config }: -let - srcSpec = import ./src.nix; - shortRev = builtins.substring 0 7 srcSpec.rev; -in mkDerivation rec { +mkDerivation rec { pname = "kernelshark"; - version = "0.9.8-${shortRev}"; + version = "1.0.0"; - src = fetchgit srcSpec; + src = fetchgit (import ./src.nix); patches = [ ./fix-Makefiles.patch ]; diff --git a/pkgs/os-specific/linux/trace-cmd/src.nix b/pkgs/os-specific/linux/trace-cmd/src.nix index 5d5ae0a8c91..8c3ef7220a8 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 = "1517dc3a15606850b1b52b789cbdeb554e2c68c6"; - sha256 = "112ccsnza3r3ha8ql733sn256bz0xjhzyw3avbr214r36aag4zrj"; + rev = "f97e28a331aba716cd431ce4b7f7fc1583875ae7"; + sha256 = "002axw1v53jk343l101hvk0ip6agl9idrc8k7d7r18mmybw637iv"; } |