nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 08:53:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

linuxPackages.perf: fix path to dmesg

Browse Source
This commit is contained in:
Sandro Jäckel 2023-09-29 14:21:20 +02:00 committed by John Titor
parent 062beac77b
commit e12175e3e1
No known key found for this signature in database
GPG Key ID: 29B0514F4E3C1CC0
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/os-specific/linux/kernel/perf/default.nix
View File

@ -57,13 +57,12 @@ in
stdenv.mkDerivation {
pname = "perf-linux";
version = kernel.version;
inherit (kernel) version src;
inherit (kernel) src;
# Fix 6.10.0 holding pkg-config completely wrong.
# Patches from perf-tools-next, should be in 6.11 or hopefully backported.
patches = lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [
patches = [
# fix wrong path to dmesg
./fix-dmesg-path.diff
] ++ lib.optionals (lib.versions.majorMinor kernel.version == "6.10") [
(fetchpatch {
url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b";
hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM=";

11
pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff Normal file
View File

@ -0,0 +1,11 @@
--- a/tools/perf/util/evsel.c 2023-10-20 15:50:53.011023294 +0200
+++ b/tools/perf/util/evsel.c 2023-10-20 15:51:03.205997633 +0200
@@ -3076,7 +3076,7 @@
return scnprintf(msg, size,
"The sys_perf_event_open() syscall returned with %d (%s) for event (%s).\n"
- "/bin/dmesg | grep -i perf may provide additional information.\n",
+ "\"dmesg | grep -i perf\" may provide additional information.\n",
err, str_error_r(err, sbuf, sizeof(sbuf)), evsel__name(evsel));
}