diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-06-28 11:19:52 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-06-29 23:42:10 -0700 |
| commit | a128e443c4cfaef1d2f13b0d91d3cc2d86804953 (patch) | |
| tree | deb21a576632bfc83e8ae9fc90157563ff889685 /pkgs/os-specific/linux/kernel | |
| parent | 48a6adc0bb45f01ffd316b9b2b289780e6ab8b56 (diff) | |
| download | nixpkgs-a128e443c4cfaef1d2f13b0d91d3cc2d86804953.tar nixpkgs-a128e443c4cfaef1d2f13b0d91d3cc2d86804953.tar.gz nixpkgs-a128e443c4cfaef1d2f13b0d91d3cc2d86804953.tar.bz2 nixpkgs-a128e443c4cfaef1d2f13b0d91d3cc2d86804953.tar.lz nixpkgs-a128e443c4cfaef1d2f13b0d91d3cc2d86804953.tar.xz nixpkgs-a128e443c4cfaef1d2f13b0d91d3cc2d86804953.tar.zst nixpkgs-a128e443c4cfaef1d2f13b0d91d3cc2d86804953.zip | |
linuxPackages_5_13.perf: fix build
Also add optional libcap and zstd
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index ae27839c8cd..b58bca352e6 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,12 +1,14 @@ { lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl -, zlib, withGtk ? false, gtk2 ? null +, zlib +, withGtk ? false, gtk2 +, withZstd ? true, zstd +, withLibcap ? true, libcap }: with lib; -assert withGtk -> gtk2 != null; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { @@ -42,7 +44,9 @@ stdenv.mkDerivation { elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl libopcodes python3 perl ] ++ lib.optional withGtk gtk2 - ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]); + ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]) + ++ lib.optional withZstd zstd + ++ lib.optional withLibcap libcap; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. @@ -55,7 +59,7 @@ stdenv.mkDerivation { ]; postPatch = '' - patchShebangs scripts/bpf_helpers_doc.py + patchShebangs scripts ''; doCheck = false; # requires "sparse" |