diff options
| author | Will Dietz <w@wdtz.org> | 2018-02-13 11:10:35 -0600 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-02-13 11:20:08 -0600 |
| commit | a65aa78e14da5d850f7f9ced30cb614ec024b979 (patch) | |
| tree | 00add1f4443b99d52827d6942381dbb95b1b9ea8 /pkgs/development/libraries/libbfd | |
| parent | 2bfe036f42a3e71a6577a899f46d075ea55e2704 (diff) | |
libbfd: simplify per reviewer feedback
Changing postPatch to postAutoreconf is needed
when updateAutotoolsGnuConfigScriptsHook is used
or the directory change happens too early.
Diffstat (limited to 'pkgs/development/libraries/libbfd')
| -rw-r--r-- | pkgs/development/libraries/libbfd/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index b41fe0ad47ee..3c71a5106d2f 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; { |