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

Revert "darwin.libSystem: multiple outputs"

Browse Source 
Broke the stdenv.

This reverts commit 69d1b7ab79cc5e46d4b419cfe95c30e58f801a85.
This commit is contained in:
Daiderd Jordan 2018-05-13 00:01:52 +02:00
parent 2c5d915200
commit f14841f3ce
No known key found for this signature in database
GPG Key ID: D02435D05B810C96
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View File

@ -3,17 +3,10 @@
removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }: removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:
appleDerivation rec { appleDerivation rec {
phases = [ "unpackPhase" "installPhase" ];
nativeBuildInputs = [ cpio ]; 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 = '' installPhase = ''
export NIX_ENFORCE_PURITY= 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/Availability*.h $out/include
cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.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) (cd $dep/include && find . -name '*.h' | cpio -pdm $out/include)
done done
(cd ${cctools.dev}/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

6
pkgs/stdenv/darwin/default.nix
View File

@ -225,7 +225,7 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ xz.bin xz.out libcxx libcxxabi ]) ++ (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; overrides = persistent;
}; };
@ -263,7 +263,7 @@ in rec {
allowedRequisites = allowedRequisites =
[ bootstrapTools ] ++ [ bootstrapTools ] ++
(with pkgs; [ xz.bin xz.out bash libcxx libcxxabi ]) ++ (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; overrides = persistent;
}; };
@ -383,7 +383,7 @@ in rec {
binutils.bintools darwin.binutils darwin.binutils.bintools binutils.bintools darwin.binutils darwin.binutils.bintools
cc.expand-response-params cc.expand-response-params
]) ++ (with pkgs.darwin; [ ]) ++ (with pkgs.darwin; [
dyld Libsystem Libsystem.dev CF cctools ICU libiconv locale dyld Libsystem CF cctools ICU libiconv locale
]); ]);
overrides = self: super: overrides = self: super: