nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-03 12:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

libbfd: simplify per reviewer feedback

Browse Source 
Changing postPatch to postAutoreconf is needed
when updateAutotoolsGnuConfigScriptsHook is used
or the directory change happens too early.
This commit is contained in:
Will Dietz 2018-02-13 11:10:35 -06:00
parent 2bfe036f42
commit a65aa78e14
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/libraries/libbfd/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv { stdenv
, fetchurl, fetchpatch, autoreconfHook264, buildPackages, bison, binutils-raw , fetchurl, fetchpatch, autoreconfHook264, bison, binutils-raw
, libiberty, zlib , libiberty, zlib
}: }:
@ -18,30 +18,20 @@ stdenv.mkDerivation rec {
]; ];
# We just want to build libbfd # We just want to build libbfd
preConfigure = '' postAutoreconf = ''
cd bfd cd bfd
''; '';
depsBuildBuilds = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoreconfHook264 bison ]; nativeBuildInputs = [ autoreconfHook264 bison ];
buildInputs = [ libiberty zlib ]; buildInputs = [ libiberty zlib ];
configurePlatforms = [ "build" "host" "target" ];
configureFlags = [ configureFlags = [
"--enable-targets=all" "--enable-64-bit-bfd" "--enable-targets=all" "--enable-64-bit-bfd"
"--enable-install-libbfd" "--enable-install-libbfd"
"--enable-shared" "--enable-shared"
"--with-system-zlib" "--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; enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {