Skip to content

elfutils: revert "split debuginfod into its own output" #237595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lheckemann merged 1 commit into from
Jun 14, 2023
Merged

elfutils: revert "split debuginfod into its own output" #237595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pkgs/development/tools/misc/elfutils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,19 +41,14 @@ stdenv.mkDerivation rec {

postPatch = ''
patchShebangs tests/*.sh
'' + lib.optionalString enableDebuginfod ''
sed -i '1i DESTDIR=$(debuginfod)' debuginfod/Makefile.in
'' + lib.optionalString stdenv.hostPlatform.isRiscV ''
# disable failing test:
#
# > dwfl_thread_getframes: No DWARF information found
sed -i s/run-backtrace-dwarf.sh//g tests/Makefile.in
'';

# debuginfod goes in its own output, as it increases closure size
# significantly by depending on gcc. Many uses, such as libbpf
# (depended on by systemd), don't need debuginfod.
outputs = [ "bin" "dev" "out" "man" ] ++ lib.optional enableDebuginfod "debuginfod";
outputs = [ "bin" "dev" "out" "man" ];

# We need bzip2 in NativeInputs because otherwise we can't unpack the src,
# as the host-bzip2 will be in the path.
Expand Down