public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cctools: Don't always bring in headers

Browse Source 
- Give cctools a dev output for the headers

 - Update Libsystem to grab the headers from that dev output

 - Don't include the headers in Darwin binutils, just as GNU Binutils no
   longer does.
This commit is contained in:
John Ericson
2017-11-16 17:45:41 -05:00
parent 32a6838bc6
commit 652c2beda9
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+1 -1
View File
@@ -23,7 +23,7 @@ appleDerivation rec {
(cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
done done
(cd ${cctools}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o) (cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
cat <<EOF > $out/include/TargetConditionals.h cat <<EOF > $out/include/TargetConditionals.h
#ifndef __TARGETCONDITIONALS__ #ifndef __TARGETCONDITIONALS__
pkgs/os-specific/darwin/binutils/default.nix
-4
View File
@@ -37,10 +37,6 @@ stdenv.mkDerivation {
ln -sf "${cctools}/bin/$i" "$out/bin/$i" ln -sf "${cctools}/bin/$i" "$out/bin/$i"
done 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 # 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}/share $out/share
pkgs/os-specific/darwin/cctools/port.nix
+2
View File
@@ -29,6 +29,8 @@ let
sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
}; };
outputs = [ "out" "dev" ];
nativeBuildInputs = [ autoconf automake libtool_2 ]; nativeBuildInputs = [ autoconf automake libtool_2 ];
buildInputs = [ libuuid ] ++ buildInputs = [ libuuid ] ++
# Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)