alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge branch 'stdenv-darwin-persist' into ios-mini-staging

Browse source
This commit is contained in:
John Ericson 2018-05-23 10:04:55 -04:00
parent c641a74bd6 f567a851a1
commit 25f4f06c2e
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/stdenv/darwin/default.nix
View file

@ -294,7 +294,7 @@ in rec {
extraPreHook = '' extraPreHook = ''
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
''; '';
overrides = self: super: (persistent self super) // { overrides = lib.composeExtensions persistent (self: super: {
# Hack to make sure we don't link ncurses in bootstrap tools. The proper # Hack to make sure we don't link ncurses in bootstrap tools. The proper
# solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib, # solution is to avoid passing -L/nix-store/...-bootstrap-tools/lib,
# quite a sledgehammer just to get the C runtime. # quite a sledgehammer just to get the C runtime.
@ -303,7 +303,7 @@ in rec {
"--disable-curses" "--disable-curses"
]; ];
}); });
}; });
}; };
stdenvDarwin = prevStage: let stdenvDarwin = prevStage: let
@ -321,7 +321,7 @@ in rec {
darwin = super.darwin // { darwin = super.darwin // {
inherit (darwin) dyld ICU Libsystem libiconv; inherit (darwin) dyld ICU Libsystem libiconv;
} // lib.optionalAttrs (super.targetPlatform == localSystem) { } // lib.optionalAttrs (super.targetPlatform == localSystem) {
inherit (darwin) binutils cctools; inherit (darwin) binutils binutils-unwrapped cctools;
}; };
} // lib.optionalAttrs (super.targetPlatform == localSystem) { } // lib.optionalAttrs (super.targetPlatform == localSystem) {
# Need to get rid of these when cross-compiling. # Need to get rid of these when cross-compiling.
@ -386,16 +386,15 @@ in rec {
dyld Libsystem CF cctools ICU libiconv locale dyld Libsystem CF cctools ICU libiconv locale
]); ]);
overrides = self: super: overrides = lib.composeExtensions persistent (self: super: {
let persistent' = persistent self super; in persistent' // {
clang = cc; clang = cc;
llvmPackages = persistent'.llvmPackages // { clang = cc; }; llvmPackages = super.llvmPackages // { clang = cc; };
inherit cc; inherit cc;
darwin = super.darwin // { darwin = super.darwin // {
xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; }; xnu = super.darwin.xnu.override { python = super.python.override { configd = null; }; };
}; };
}; });
}; };
stagesDarwin = [ stagesDarwin = [