alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #128537 from jonringer/fix-linux-perf

Browse source 
linuxPackages_5_13.perf: fix build
This commit is contained in:
Jörg Thalheim 2021-07-03 19:05:24 +01:00 committed by GitHub
parent f3fc8b9fa8 e587a7fcf1
commit bc8af97443
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/os-specific/linux/kernel/perf.nix
View file

@ -1,12 +1,14 @@
{ lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper { 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 , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkg-config, libunwind, binutils
, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl
, zlib, withGtk ? false, gtk2 ? null , zlib
, withGtk ? false, gtk2
, withZstd ? true, zstd
, withLibcap ? true, libcap
}: }:
with lib; with lib;
assert withGtk -> gtk2 != null;
assert versionAtLeast kernel.version "3.12"; assert versionAtLeast kernel.version "3.12";
stdenv.mkDerivation { stdenv.mkDerivation {
@ -42,7 +44,9 @@ stdenv.mkDerivation {
elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
libopcodes python3 perl libopcodes python3 perl
] ++ lib.optional withGtk gtk2 ] ++ 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 # Note: we don't add elfutils to buildInputs, since it provides a
# bad `ld' and other stuff. # bad `ld' and other stuff.
@ -55,8 +59,7 @@ stdenv.mkDerivation {
]; ];
postPatch = '' postPatch = ''
patchShebangs scripts/bpf_helpers_doc.py patchShebangs scripts
patchShebangs scripts/bpf_doc.py
''; '';
doCheck = false; # requires "sparse" doCheck = false; # requires "sparse"