From 32a6838bc6cfd07b1a0e18368468ba825b4b18c2 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 16 Nov 2017 17:40:38 -0500 Subject: [PATCH] darwin-bintuils: Don't try to bring in missing bits of GNU Binutils libbfd and libopcdes are separate derivations which now provide all headers and libraries. Binutils should just provide executables. --- pkgs/os-specific/darwin/binutils/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 5fc0db44f860..e38272593d00 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -37,17 +37,12 @@ stdenv.mkDerivation { ln -sf "${cctools}/bin/$i" "$out/bin/$i" done - for i in ${stdenv.lib.getDev binutils-raw}/include/*.h; do - ln -s "$i" "$out/include/$(basename $i)" - done - for i in ${cctools}/include/*; do ln -s "$i" "$out/include/$(basename $i)" done # FIXME: this will give us incorrect man pages for bits of cctools ln -s ${binutils-raw.out}/share $out/share - ln -s ${binutils-raw.out}/lib $out/lib ln -s ${cctools}/libexec $out/libexec '';