diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-12 21:49:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-12 21:49:20 +0200 |
| commit | bd2a288ea5d0e7df7e6cad31fcb84c05619d02b6 (patch) | |
| tree | ca73204056364698d9fb0fc37bce4a49abaf1520 /pkgs/os-specific | |
| parent | 1aac6f3b28465a0a88fac91737a7543a8ef6cb40 (diff) | |
| parent | a3270eb062a93bc780b7ee923df6c6a70b5a25b8 (diff) | |
Merge pull request #141295 from trofi/fix-perf-annotate
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/perf.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index b58bca352e631..045f80ce9ac26 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,5 +1,5 @@ { 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 , zlib , withGtk ? false, gtk2 @@ -54,7 +54,6 @@ stdenv.mkDerivation { "-Wno-error=cpp" "-Wno-error=bool-compare" "-Wno-error=deprecated-declarations" - "-DOBJDUMP_PATH=\"${binutils}/bin/objdump\"" "-Wno-error=stringop-truncation" ]; @@ -69,8 +68,9 @@ stdenv.mkDerivation { installFlags = [ "install" "install-man" "ASCIIDOC8=1" "prefix=$(out)" ]; preFixup = '' + # pull in 'objdump' into PATH to make annotations work wrapProgram $out/bin/perf \ - --prefix PATH : "${binutils}/bin" + --prefix PATH : "${binutils-unwrapped}/bin" ''; meta = { |