diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-04-11 14:55:52 +0200 |
commit | ee6894ca1297afe0caf2f389c1f9a9220826b749 (patch) | |
tree | 02f96b5744cef8bc55010fb8301f5b50c0748d4c /pkgs/development/libraries/libbfd/default.nix | |
parent | 392874b9b1411dc7b879997bd8776b921feea61d (diff) | |
parent | 617c26df84d5670574864a9ccad0eaf8708bd86a (diff) | |
download | nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.gz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.bz2 nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.lz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.xz nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.tar.zst nixlib-ee6894ca1297afe0caf2f389c1f9a9220826b749.zip |
Merge staging into master
Diffstat (limited to 'pkgs/development/libraries/libbfd/default.nix')
-rw-r--r-- | pkgs/development/libraries/libbfd/default.nix | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/libraries/libbfd/default.nix b/pkgs/development/libraries/libbfd/default.nix index ac508908e8f2..3f244d399f7e 100644 --- a/pkgs/development/libraries/libbfd/default.nix +++ b/pkgs/development/libraries/libbfd/default.nix @@ -1,17 +1,15 @@ { stdenv, buildPackages -, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison +, fetchurl, fetchpatch, gnu-config, autoreconfHook264, bison, binutils-unwrapped , libiberty, zlib }: -let inherit (buildPackages.buildPackages) binutils-raw; in - stdenv.mkDerivation rec { name = "libbfd-${version}"; - inherit (binutils-raw.bintools) version src; + inherit (binutils-unwrapped) version src; outputs = [ "out" "dev" ]; - patches = binutils-raw.bintools.patches ++ [ + patches = binutils-unwrapped.patches ++ [ ../../tools/misc/binutils/build-components-separately.patch (fetchpatch { url = "https://raw.githubusercontent.com/mxe/mxe/e1d4c144ee1994f70f86cf7fd8168fe69bd629c6/src/bfd-1-disable-subdir-doc.patch"; |