mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-22 06:05:13 +00:00
136ae024c0
Besides updating the version, this commit decouples trace-cmd and kernelshark source revisions. These two programs are developed in the same repository but are released independently. Nixpkgs built the previous versions of these programs from the same source commit, which meant that at least one of the programs were not built from the officially released version. Now we use the release tags of the corresponding programs.
36 lines
1.8 KiB
Diff
36 lines
1.8 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index b034042..b8a06bc 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -338,6 +338,7 @@ libtracefs.a: $(LIBTRACEFS_STATIC)
|
|
libtracefs.so: $(LIBTRACEFS_SHARED)
|
|
|
|
libs: $(LIBTRACECMD_SHARED) $(LIBTRACEEVENT_SHARED) $(LIBTRACEFS_SHARED)
|
|
+libs: $(LIBTRACECMD_STATIC) $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC)
|
|
|
|
test: force $(LIBTRACEEVENT_STATIC) $(LIBTRACEFS_STATIC) $(LIBTRACECMD_STATIC)
|
|
ifneq ($(CUNIT_INSTALLED),1)
|
|
@@ -414,6 +415,9 @@ install_libs: libs
|
|
$(Q)$(call do_install,$(LIBTRACECMD_SHARED),$(libdir_SQ)/trace-cmd)
|
|
$(Q)$(call do_install,$(LIBTRACEEVENT_SHARED),$(libdir_SQ)/traceevent)
|
|
$(Q)$(call do_install,$(LIBTRACEFS_SHARED),$(libdir_SQ)/tracefs)
|
|
+ $(Q)$(call do_install,$(LIBTRACECMD_STATIC),$(libdir_SQ)/trace-cmd)
|
|
+ $(Q)$(call do_install,$(LIBTRACEEVENT_STATIC),$(libdir_SQ)/traceevent)
|
|
+ $(Q)$(call do_install,$(LIBTRACEFS_STATIC),$(libdir_SQ)/tracefs)
|
|
$(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)/trace-cmd)
|
|
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
|
|
index 457c100..687e150 100644
|
|
--- a/kernel-shark/src/CMakeLists.txt
|
|
+++ b/kernel-shark/src/CMakeLists.txt
|
|
@@ -92,7 +92,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/)
|