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

stdenv: darwin: give distinct names to all the stages

Browse Source
This commit is contained in:
Jan Malakhovski 2018-02-25 22:03:40 +00:00
parent e654d9a9ca
commit 49afe1d490
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,12 +61,14 @@ in rec {
libcxx, libcxx,
allowedRequisites ? null}: allowedRequisites ? null}:
let let
name = "bootstrap-stage${toString step}";
buildPackages = lib.optionalAttrs (last ? stdenv) { buildPackages = lib.optionalAttrs (last ? stdenv) {
inherit (last) stdenv; inherit (last) stdenv;
}; };
coreutils = { name = "coreutils-9.9.9"; outPath = bootstrapTools; }; coreutils = { name = "${name}-coreutils"; outPath = bootstrapTools; };
gnugrep = { name = "gnugrep-9.9.9"; outPath = bootstrapTools; }; gnugrep = { name = "${name}-gnugrep"; outPath = bootstrapTools; };
bintools = import ../../build-support/bintools-wrapper { bintools = import ../../build-support/bintools-wrapper {
inherit shell; inherit shell;
@ -76,7 +78,7 @@ in rec {
nativeLibc = false; nativeLibc = false;
inherit buildPackages coreutils gnugrep; inherit buildPackages coreutils gnugrep;
libc = last.pkgs.darwin.Libsystem; libc = last.pkgs.darwin.Libsystem;
bintools = { name = "binutils-9.9.9"; outPath = bootstrapTools; }; bintools = { name = "${name}-binutils"; outPath = bootstrapTools; };
}; };
cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper { cc = if isNull last then "/dev/null" else import ../../build-support/cc-wrapper {
@ -91,17 +93,17 @@ in rec {
inherit buildPackages coreutils gnugrep bintools; inherit buildPackages coreutils gnugrep bintools;
libc = last.pkgs.darwin.Libsystem; libc = last.pkgs.darwin.Libsystem;
isClang = true; isClang = true;
cc = { name = "clang-9.9.9"; outPath = bootstrapTools; }; cc = { name = "${name}-clang"; outPath = bootstrapTools; };
}; };
thisStdenv = import ../generic { thisStdenv = import ../generic {
name = "${name}-stdenv-darwin";
inherit config shell extraNativeBuildInputs extraBuildInputs; inherit config shell extraNativeBuildInputs extraBuildInputs;
allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [ allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
cc.expand-response-params cc.bintools cc.expand-response-params cc.bintools
]; ];
name = "stdenv-darwin-boot-${toString step}";
buildPlatform = localSystem; buildPlatform = localSystem;
hostPlatform = localSystem; hostPlatform = localSystem;
targetPlatform = localSystem; targetPlatform = localSystem;
@ -146,7 +148,7 @@ in rec {
overrides = self: super: with stage0; rec { overrides = self: super: with stage0; rec {
darwin = super.darwin // { darwin = super.darwin // {
Libsystem = stdenv.mkDerivation { Libsystem = stdenv.mkDerivation {
name = "bootstrap-Libsystem"; name = "bootstrap-stage0-Libsystem";
buildCommand = '' buildCommand = ''
mkdir -p $out mkdir -p $out
ln -s ${bootstrapTools}/lib $out/lib ln -s ${bootstrapTools}/lib $out/lib
@ -157,7 +159,7 @@ in rec {
}; };
libcxx = stdenv.mkDerivation { libcxx = stdenv.mkDerivation {
name = "bootstrap-libcxx"; name = "bootstrap-stage0-libcxx";
phases = [ "installPhase" "fixupPhase" ]; phases = [ "installPhase" "fixupPhase" ];
installPhase = '' installPhase = ''
mkdir -p $out/lib $out/include mkdir -p $out/lib $out/include
@ -169,7 +171,7 @@ in rec {
}; };
libcxxabi = stdenv.mkDerivation { libcxxabi = stdenv.mkDerivation {
name = "bootstrap-libcxxabi"; name = "bootstrap-stage0-libcxxabi";
buildCommand = '' buildCommand = ''
mkdir -p $out/lib mkdir -p $out/lib
ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib ln -s ${bootstrapTools}/lib/libc++abi.dylib $out/lib/libc++abi.dylib
@ -325,11 +327,11 @@ in rec {
inherit binutils binutils-raw; inherit binutils binutils-raw;
}; };
in import ../generic rec { in import ../generic rec {
name = "stdenv-darwin";
inherit config; inherit config;
inherit (pkgs.stdenv) fetchurlBoot; inherit (pkgs.stdenv) fetchurlBoot;
name = "stdenv-darwin";
buildPlatform = localSystem; buildPlatform = localSystem;
hostPlatform = localSystem; hostPlatform = localSystem;
targetPlatform = localSystem; targetPlatform = localSystem;