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

Merge pull request #28798 from obsidiansystems/darwin-no-nativeTools

Browse Source 
darwin-stdenv: Don't use `nativeTools`
This commit is contained in:
John Ericson 2017-08-31 19:33:27 -04:00 committed by GitHub
commit 29c4294f85
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,15 +79,17 @@ in rec {
inherit shell; inherit shell;
inherit (last) stdenv; inherit (last) stdenv;
nativeTools = true; nativeTools = false;
nativePrefix = bootstrapTools;
nativeLibc = false; nativeLibc = false;
buildPackages = lib.optionalAttrs (last ? stdenv) { buildPackages = lib.optionalAttrs (last ? stdenv) {
inherit (last) stdenv; inherit (last) stdenv;
}; };
libc = last.pkgs.darwin.Libsystem; libc = last.pkgs.darwin.Libsystem;
isClang = true; isClang = true;
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; cc = { name = "clang-9.9.9"; outPath = bootstrapTools; };
binutils = { name = "binutils-9.9.9"; outPath = bootstrapTools; };
coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; };
gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; };
}; };
preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") '' preHook = stage0.stdenv.lib.optionalString (shell == "${bootstrapTools}/bin/bash") ''
@ -267,7 +269,16 @@ in rec {
extraPreHook = '' extraPreHook = ''
export PATH_LOCALE=${pkgs.darwin.locale}/share/locale export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
''; '';
overrides = persistent; overrides = self: super: (persistent self super) // {
# 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,
# quite a sledgehammer just to get the C runtime.
gettext = super.gettext.overrideAttrs (old: {
configureFlags = old.configureFlags ++ [
"--disable-curses"
];
});
};
}; };
stdenvDarwin = prevStage: let stdenvDarwin = prevStage: let