alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

trace-cmd: 2.8-c8d9e1a -> 2.8-0c957d2

Browse source
This commit is contained in:
Bas van Dijk 2019-06-03 23:59:34 +02:00
parent fa5a346244
commit d1466e7006
3 changed files with 2 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
pkgs/os-specific/linux/trace-cmd/fix-kernel-shark-CMakeLists.txt.patch
View file

@ -1,32 +0,0 @@
diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake
index 10e3610..ba29ced 100644
--- a/kernel-shark/build/ks.desktop.cmake
+++ b/kernel-shark/build/ks.desktop.cmake
@@ -5,6 +5,6 @@ Name=Kernel Shark
GenericName=Kernel Shark
Comment=
Exec=@_INSTALL_PREFIX@/bin/kernelshark
-Icon=@KS_DIR@/icons/ksharkicon.png
+Icon=@_INSTALL_PREFIX@/share/icons/kernelshark/ksharkicon.png
Categories=System;
Terminal=false
diff --git a/kernel-shark/src/CMakeLists.txt b/kernel-shark/src/CMakeLists.txt
index b7dbd7e..be633ce 100644
--- a/kernel-shark/src/CMakeLists.txt
+++ b/kernel-shark/src/CMakeLists.txt
@@ -82,10 +82,13 @@ if (Qt5Widgets_FOUND AND Qt5Network_FOUND)
LIBRARY DESTINATION ${_INSTALL_PREFIX}/lib/kshark/)
install(FILES "${KS_DIR}/kernelshark.desktop"
- DESTINATION /usr/share/applications/)
+ DESTINATION ${_INSTALL_PREFIX}/share/applications/)
+
+ install(FILES "${KS_DIR}/icons/ksharkicon.png"
+ DESTINATION ${_INSTALL_PREFIX}/share/icons/kernelshark)
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/)

3
pkgs/os-specific/linux/trace-cmd/kernelshark.nix
View file

@ -10,9 +10,6 @@ in mkDerivation rec {
sourceRoot = "trace-cmd-${shortRev}/kernel-shark";
patches = [ ./fix-kernel-shark-CMakeLists.txt.patch ];
patchFlags = [ "-p2" ];
nativeBuildInputs = [ cmake ];
buildInputs = [ qtbase json_c mesa_glu freeglut ];

4
pkgs/os-specific/linux/trace-cmd/src.nix
View file

@ -1,5 +1,5 @@
{
url = "git://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/";
rev = "c8d9e1a82e75ae0d35d8ca2800ef6c65be3ac4e5";
sha256 = "0ask7sdmlpffcfbzg3g68bqx8gy7qbk2h0faw8ksbw7p8cf5mnhd";
rev = "0c957d2d85787350083ac990b35428e665f392a5";
sha256 = "1b1d8k5qazm7x6vcprvl9hwsw3kk44pv8wcbgny53rniv7vv22ia";
}