diff options
| author | John Ericson <Ericson2314@yahoo.com> | 2017-11-17 15:31:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 15:31:45 -0500 |
| commit | ccb93aee171cdf21dc916d20791aea81f6a9cd06 (patch) | |
| tree | c76f7f001bd6a74eeb893de6bffb7e89259f2a7b /pkgs/os-specific | |
| parent | ca86a250613765d6351cbb7c9dc46e9a17d4996e (diff) | |
| parent | 652c2beda9a5351ddd07e422215100aca75412ae (diff) | |
| download | nixlib-ccb93aee171cdf21dc916d20791aea81f6a9cd06.tar nixlib-ccb93aee171cdf21dc916d20791aea81f6a9cd06.tar.gz nixlib-ccb93aee171cdf21dc916d20791aea81f6a9cd06.tar.bz2 nixlib-ccb93aee171cdf21dc916d20791aea81f6a9cd06.tar.lz nixlib-ccb93aee171cdf21dc916d20791aea81f6a9cd06.tar.xz nixlib-ccb93aee171cdf21dc916d20791aea81f6a9cd06.tar.zst nixlib-ccb93aee171cdf21dc916d20791aea81f6a9cd06.zip | |
Merge pull request #31754 from obsidiansystems/simplify-darwin-binutils
cctools, darwin-bintuils: Don't always bring in headers
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/binutils/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/darwin/cctools/port.nix | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 3d7e59f15547..28406c9751dc 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -23,7 +23,7 @@ appleDerivation rec { (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include) 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 #ifndef __TARGETCONDITIONALS__ diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index 5fc0db44f860..8ac93689373d 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -37,17 +37,8 @@ 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 ''; diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 182b591a60aa..e08e78339832 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -29,6 +29,8 @@ let sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ autoconf automake libtool_2 ]; buildInputs = [ libuuid ] ++ # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang) |