diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 15f92157e147..0d639531e840 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -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="; diff --git a/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff b/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff new file mode 100644 index 000000000000..0bc3300a2eaf --- /dev/null +++ b/pkgs/os-specific/linux/kernel/perf/fix-dmesg-path.diff @@ -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)); + } +