Revert "Merge #160259: separateDebugInfo: Use --strip-unneeded"

This reverts commit 848091a, reversing
changes made to ab0e692.

It caused issues with elfutils tests,
probably through over-stripping of glibc parts.

pkgs/build-support/setup-hooks/separate-debug-info.sh

@@ -34,7 +34,7 @@ _separateDebugInfo() {
         # firmware blobs in QEMU.)
         (
             $OBJCOPY --only-keep-debug "$i" "$dst/${id:0:2}/${id:2}.debug"
-            $STRIP --strip-unneeded "$i"
+            $STRIP --strip-debug "$i"
 
             # Also a create a symlink <original-name>.debug.
             ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"

pkgs/development/libraries/libpsl/default.nix

@@ -3,7 +3,6 @@
 , autoreconfHook
 , docbook_xsl
 , docbook_xml_dtd_43
-, glibc
 , gtk-doc
 , lzip
 , libidn2
@@ -39,7 +38,6 @@ in stdenv.mkDerivation rec {
     python3
     libxslt
   ] ++ lib.optionals enableValgrindTests [
-    glibc.debug
     valgrind
   ];
 

pkgs/development/tools/analysis/valgrind/default.nix

@@ -1,7 +1,6 @@
 { lib, stdenv, fetchurl, fetchpatch
 , autoreconfHook, perl
 , gdb, cctools, xnu, bootstrap_cmds
-, setupDebugInfoDirs
 }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
       url = "https://bugsfiles.kde.org/attachment.cgi?id=143535";
       sha256 = "036zyk30rixjvpylw3c7n171n4gpn6zcp7h6ya2dz4h5r478l9i6";
     })
-    ./debug-info-from-env.patch
   ];
 
   outputs = [ "out" "dev" "man" "doc" ];
@@ -34,10 +32,6 @@ stdenv.mkDerivation rec {
   # Perl is also a native build input.
   nativeBuildInputs = [ autoreconfHook perl ];
 
-  # Not propagatedNativeBuildInputs because of
-  # https://github.com/NixOS/nixpkgs/issues/64992.
-  propagatedBuildInputs = [ setupDebugInfoDirs ];
-
   enableParallelBuilding = true;
   separateDebugInfo = stdenv.isLinux;