Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2c5d915200ae
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f14841f3ce73
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 13, 2018

  1. Revert "darwin.libSystem: multiple outputs" 

    Broke the stdenv.

This reverts commit 69d1b7a.
    @LnL7
    LnL7 committed May 13, 2018
    Copy the full SHA
    f14841f View commit details
Showing with 9 additions and 13 deletions.
  1. +6 −10 pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
  2. +3 −3 pkgs/stdenv/darwin/default.nix
16 changes: 6 additions & 10 deletions pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,16 +3,9 @@
removefile, libresolv, Libnotify, libplatform, libpthread, mDNSResponder, launchd, libutil, version }:

appleDerivation rec {
nativeBuildInputs = [ cpio ];

outputs = [ "out" "dev" ];
phases = [ "unpackPhase" "installPhase" ];

bundledHeaders = map stdenv.lib.getDev [ Libc Libm Libinfo dyld architecture
libclosure CarbonHeaders libdispatch
ncurses CommonCrypto copyfile
removefile libresolv Libnotify
libplatform mDNSResponder launchd
libutil libpthread ];
nativeBuildInputs = [ cpio ];

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
6 changes: 3 additions & 3 deletions pkgs/stdenv/darwin/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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: