Revert "darwin.libSystem: multiple outputs"
Broke the stdenv.
This reverts commit 69d1b7ab79
.
This commit is contained in:
parent
2c5d915200
commit
f14841f3ce
@ -3,17 +3,10 @@
|
||||
removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
|
||||
|
||||
appleDerivation rec {
|
||||
phases = [ "unpackPhase" "installPhase" ];
|
||||
|
||||
nativeBuildInputs = [ cpio ];
|
||||
|
||||
outputs = [ "out" "dev" ];
|
||||
|
||||
bundledHeaders = map stdenv.lib.getDev [ Libc Libm Libinfo dyld architecture
|
||||
libclosure CarbonHeaders libdispatch
|
||||
ncurses CommonCrypto copyfile
|
||||
removefile libresolv Libnotify
|
||||
libplatform mDNSResponder launchd
|
||||
libutil libpthread ];
|
||||
|
||||
installPhase = ''
|
||||
export NIX_ENFORCE_PURITY=
|
||||
|
||||
@ -24,10 +17,13 @@ appleDerivation rec {
|
||||
cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
|
||||
cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h $out/include
|
||||
|
||||
for dep in $bundledHeaders; do
|
||||
for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} ${libclosure} ${CarbonHeaders} \
|
||||
${libdispatch} ${ncurses.dev} ${CommonCrypto} ${copyfile} ${removefile} ${libresolv} \
|
||||
${Libnotify} ${libplatform} ${mDNSResponder} ${launchd} ${libutil} ${libpthread}; do
|
||||
(cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
|
||||
done
|
||||
|
||||
|
||||
(cd ${cctools.dev}/include/mach-o && find . -name '*.h' | cpio -pdm $out/include/mach-o)
|
||||
|
||||
cat <<EOF > $out/include/TargetConditionals.h
|
||||
|
@ -225,7 +225,7 @@ in rec {
|
||||
allowedRequisites =
|
||||
[ bootstrapTools ] ++
|
||||
(with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++
|
||||
(with pkgs.darwin; [ dyld Libsystem Libsystem.dev CF ICU locale ]);
|
||||
(with pkgs.darwin; [ dyld Libsystem CF ICU locale ]);
|
||||
|
||||
overrides = persistent;
|
||||
};
|
||||
@ -263,7 +263,7 @@ in rec {
|
||||
allowedRequisites =
|
||||
[ bootstrapTools ] ++
|
||||
(with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++
|
||||
(with pkgs.darwin; [ dyld ICU Libsystem Libsystem.dev locale ]);
|
||||
(with pkgs.darwin; [ dyld ICU Libsystem locale ]);
|
||||
|
||||
overrides = persistent;
|
||||
};
|
||||
@ -383,7 +383,7 @@ in rec {
|
||||
binutils.bintools darwin.binutils darwin.binutils.bintools
|
||||
cc.expand-response-params
|
||||
]) ++ (with pkgs.darwin; [
|
||||
dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale
|
||||
dyld Libsystem CF cctools ICU libiconv locale
|
||||
]);
|
||||
|
||||
overrides = self: super:
|
||||
|
Loading…
Reference in New Issue
Block a user