diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2021-10-11 23:05:11 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2021-10-11 23:07:19 +0100 |
| commit | a3270eb062a93bc780b7ee923df6c6a70b5a25b8 (patch) | |
| tree | 2a51fbaaf90cfdd1159168bd40f2c6730a1a35e7 | |
| parent | 24d90f415064e005f1038740eb715055ea2bbc9b (diff) | |
| download | nixpkgs-a3270eb062a93bc780b7ee923df6c6a70b5a25b8.tar nixpkgs-a3270eb062a93bc780b7ee923df6c6a70b5a25b8.tar.gz nixpkgs-a3270eb062a93bc780b7ee923df6c6a70b5a25b8.tar.bz2 nixpkgs-a3270eb062a93bc780b7ee923df6c6a70b5a25b8.tar.lz nixpkgs-a3270eb062a93bc780b7ee923df6c6a70b5a25b8.tar.xz nixpkgs-a3270eb062a93bc780b7ee923df6c6a70b5a25b8.tar.zst nixpkgs-a3270eb062a93bc780b7ee923df6c6a70b5a25b8.zip | |
linuxPackages.perf: fix objdump lookup
By default 'perf annotate' runs "objdump" from PATH.
Unfortunately ${binutils}/bin/ dos not provide it as
it's a minimal wrapper for gcc.
${binutils-unwrapped}/bin/ does have full set of tools.
Let's use that instead.
| -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 b58bca352e6..045f80ce9ac 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 = { |