diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2019-11-28 11:10:47 +0000 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-12-01 18:53:03 +0100 |
| commit | b7f504812b14a706e5862a2a14fb74700f289c34 (patch) | |
| tree | 86c4c2a1e2912f925f9ccd27ceca5fd89bf02599 /pkgs | |
| parent | 1f5f6b796bbcd42faf50ffd66b81c1f87d8a152d (diff) | |
| download | nixpkgs-b7f504812b14a706e5862a2a14fb74700f289c34.tar nixpkgs-b7f504812b14a706e5862a2a14fb74700f289c34.tar.gz nixpkgs-b7f504812b14a706e5862a2a14fb74700f289c34.tar.bz2 nixpkgs-b7f504812b14a706e5862a2a14fb74700f289c34.tar.lz nixpkgs-b7f504812b14a706e5862a2a14fb74700f289c34.tar.xz nixpkgs-b7f504812b14a706e5862a2a14fb74700f289c34.tar.zst nixpkgs-b7f504812b14a706e5862a2a14fb74700f289c34.zip | |
perf: build with python3
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 1e5c987d508..37b728bde88 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, kernel, elfutils, python, 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, pkgconfig, libunwind, binutils , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , zlib, withGtk ? false, gtk2 ? null @@ -36,12 +36,13 @@ stdenv.mkDerivation { # perf refers both to newt and slang nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty audit makeWrapper pkgconfig python perl + flex bison libiberty audit makeWrapper pkgconfig ]; buildInputs = [ elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl - libopcodes - ] ++ stdenv.lib.optional withGtk gtk2; + libopcodes python3 perl + ] ++ stdenv.lib.optional withGtk gtk2 + ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]); # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. |