swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-22 21:30:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #141295 from trofi/fix-perf-annotate

Browse source
This commit is contained in:
Sandro 2021-10-12 21:49:20 +02:00 committed by GitHub
parent 1aac6f3b28 a3270eb062
commit bd2a288ea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
{ 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-unwrapped
, libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl , libiberty, audit, libbfd, libopcodes, openssl, systemtap, numactl
, zlib , zlib
, withGtk ? false, gtk2 , withGtk ? false, gtk2
@ -54,7 +54,6 @@ stdenv.mkDerivation {
"-Wno-error=cpp" "-Wno-error=cpp"
"-Wno-error=bool-compare" "-Wno-error=bool-compare"
"-Wno-error=deprecated-declarations" "-Wno-error=deprecated-declarations"
"-DOBJDUMP_PATH=\"${binutils}/bin/objdump\""
"-Wno-error=stringop-truncation" "-Wno-error=stringop-truncation"
]; ];
@ -69,8 +68,9 @@ stdenv.mkDerivation {
installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ];
preFixup = '' preFixup = ''
# pull in 'objdump' into PATH to make annotations work
wrapProgram $out/bin/perf \ wrapProgram $out/bin/perf \
--prefix PATH : "${binutils}/bin" --prefix PATH : "${binutils-unwrapped}/bin"
''; '';
meta = { meta = {