diff --git a/pkgs/development/tools/misc/elfutils/default.nix b/pkgs/development/tools/misc/elfutils/default.nix index faf7496b25f90..83a30f3e6f17f 100644 --- a/pkgs/development/tools/misc/elfutils/default.nix +++ b/pkgs/development/tools/misc/elfutils/default.nix @@ -41,8 +41,6 @@ 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: # @@ -50,10 +48,7 @@ stdenv.mkDerivation rec { 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.