libbfd: simplify per reviewer feedback

Changing postPatch to postAutoreconf is needed
when updateAutotoolsGnuConfigScriptsHook is used
or the directory change happens too early.

1 files changed, 2 insertions, 12 deletions

diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix
index b41fe0ad47e..3c71a5106d2 100644
--- a/pkgs/development/libraries/libbfd/default.nix
+++ b/pkgs/development/libraries/libbfd/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchurl, fetchpatch, autoreconfHook264, buildPackages, bison, binutils-raw
+, fetchurl, fetchpatch, autoreconfHook264, bison, binutils-raw
 , libiberty, zlib
 }:
 
@@ -18,30 +18,20 @@ stdenv.mkDerivation rec {
   ];
 
   # We just want to build libbfd
-  preConfigure = ''
+  postAutoreconf = ''
     cd bfd
   '';
 
-  depsBuildBuilds = [ buildPackages.stdenv.cc ];
   nativeBuildInputs = [ autoreconfHook264 bison ];
   buildInputs = [ libiberty zlib ];
 
-  configurePlatforms = [ "build" "host" "target" ];
   configureFlags = [
     "--enable-targets=all" "--enable-64-bit-bfd"
     "--enable-install-libbfd"
     "--enable-shared"
     "--with-system-zlib"
-    "CC_FOR_BUILD=$(CC)"
   ];
 
-  postInstall = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.targetPlatform) ''
-    # the build system likes to move things into atypical locations
-    mkdir -p $dev
-    mv $out/${stdenv.hostPlatform.config}/${stdenv.targetPlatform.config}/include $dev/include
-    mv $out/${stdenv.hostPlatform.config}/${stdenv.targetPlatform.config}/lib $out/lib
-  '';
-
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {