Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

linuxPackages_6_10.perf: fix build

Revert upstream change that breaks things in a very strange way.
See commit being reverted for details.

K900 40ebc309 f0e87420

+18
+18
pkgs/os-specific/linux/kernel/perf/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchurl 4 + , fetchpatch 4 5 , kernel 5 6 , elfutils 6 7 , python3 ··· 59 60 version = kernel.version; 60 61 61 62 inherit (kernel) src; 63 + 64 + # Fix 6.10.0 holding pkg-config completely wrong. 65 + # Patches from perf-tools-next, should be in 6.11 or hopefully backported. 66 + patches = lib.optionals (lib.versionAtLeast kernel.version "6.10") [ 67 + (fetchpatch { 68 + url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=0f0e1f44569061e3dc590cd0b8cb74d8fd53706b"; 69 + hash = "sha256-9u/zhbsDgwOr4T4k9td/WJYRuSHIfbtfS+oNx8nbOlM="; 70 + }) 71 + (fetchpatch { 72 + url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=366e17409f1f17ad872259ce4a4f8a92beb4c4ee"; 73 + hash = "sha256-NZK1u40qvMwWcgkgJPGpEax2eMo9xHrCQxSYYOK0rbo="; 74 + }) 75 + (fetchpatch { 76 + url = "https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/patch/?id=1d302f626c2a23e4fd05bb810eff300e8f2174fd"; 77 + hash = "sha256-KhCmof8LkyTcBBpfMEtolL3m3kmC5rukKzQvufVKCdI="; 78 + }) 79 + ]; 62 80 63 81 postPatch = '' 64 82 # Linux scripts