git.iko.soy/typeable/nixpkgs
on master help sign in
perf: build with python3
commitb7f504812b14a706e5862a2a14fb74700f289c34 authorJörg Thalheim <joerg@thalheim.io> dateThu 28 Nov 2019, 11:10 (7 years ago) parent1f5f6b7
1 file changed+5−4
pkgs/os-specific/linux/kernel/perf.nix+5−4
pkgs/os-specific/linux/kernel/perf.nix+5−4
@@ -1,4 +1,4 @@
1−{ lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto, makeWrapper
1+{ lib, stdenv, kernel, elfutils, python2, python3, perl, newt, slang, asciidoc, xmlto, makeWrapper
22, docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils
33, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl
44, zlib, withGtk ? false, gtk2 ? null
@@ -36,12 +36,13 @@ stdenv.mkDerivation {
3636 # perf refers both to newt and slang
3737 nativeBuildInputs = [
3838 asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt
39− flex bison libiberty audit makeWrapper pkgconfig python perl
39+ flex bison libiberty audit makeWrapper pkgconfig
4040 ];
4141 buildInputs = [
4242 elfutils newt slang libunwind libbfd zlib openssl systemtap.stapBuild numactl
43− libopcodes
44− ] ++ stdenv.lib.optional withGtk gtk2;
43+ libopcodes python3 perl
44+ ] ++ stdenv.lib.optional withGtk gtk2
45+ ++ (if (versionAtLeast kernel.version "4.19") then [ python3 ] else [ python2 ]);
4546
4647 # Note: we don't add elfutils to buildInputs, since it provides a
4748 # bad `ld' and other stuff.