From 45e253cacbd272f9bab414b260dd5bf5331d0409 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 19 Mar 2018 16:25:54 -0400 Subject: [PATCH] cross stdenv: Make depsBuildBuild overrideable by config too. --- pkgs/stdenv/cross/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix index 8da3555c6c6..6e306571853 100644 --- a/pkgs/stdenv/cross/default.nix +++ b/pkgs/stdenv/cross/default.nix @@ -10,9 +10,15 @@ let config = builtins.removeAttrs config [ "replaceStdenv" ]; }; -in bootStages ++ [ +in lib.init bootStages ++ [ - # Build Packages + # Regular native packages + (somePrevStage: lib.last bootStages somePrevStage // { + # It's OK to change the built-time dependencies + allowCustomOverrides = true; + }) + + # Build tool Packages (vanillaPackages: { inherit config overlays; selfBuild = false;