diff options
| author | K900 <me@0upti.me> | 2022-10-03 11:50:37 +0300 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-10-03 11:04:50 +0000 |
| commit | dbf1d73cd1a17276196afeee169b4cf7834b7a96 (patch) | |
| tree | ff7ac2fcf89345eb174e97f52f62320a3edf2550 | |
| parent | 0faffb55310c6ac42b0741b6a52b88482ae41f96 (diff) | |
| download | nixlib-dbf1d73cd1a17276196afeee169b4cf7834b7a96.tar nixlib-dbf1d73cd1a17276196afeee169b4cf7834b7a96.tar.gz nixlib-dbf1d73cd1a17276196afeee169b4cf7834b7a96.tar.bz2 nixlib-dbf1d73cd1a17276196afeee169b4cf7834b7a96.tar.lz nixlib-dbf1d73cd1a17276196afeee169b4cf7834b7a96.tar.xz nixlib-dbf1d73cd1a17276196afeee169b4cf7834b7a96.tar.zst nixlib-dbf1d73cd1a17276196afeee169b4cf7834b7a96.zip | |
perf: fix build with kernel 6.0
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index dcb1c4e9dcc1..5e0b5850f015 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper +{ lib, stdenv, fetchpatch, kernel, elfutils, python2, python3, python3Packages, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils-unwrapped , libiberty, audit, libbfd, libbfd_2_38, libopcodes, libopcodes_2_38, openssl, systemtap, numactl , zlib @@ -53,7 +53,8 @@ stdenv.mkDerivation { ++ lib.optional withGtk gtk2 ++ (if (lib.versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) ++ lib.optional withZstd zstd - ++ lib.optional withLibcap libcap; + ++ lib.optional withLibcap libcap + ++ lib.optional (lib.versionAtLeast kernel.version "6.0") python3Packages.setuptools; NIX_CFLAGS_COMPILE = toString [ "-Wno-error=cpp" @@ -63,7 +64,7 @@ stdenv.mkDerivation { ]; postPatch = '' - patchShebangs scripts + patchShebangs scripts tools/perf/pmu-events/jevents.py ''; doCheck = false; # requires "sparse" |