Unverified Commit 124c8281 authored by Artturin's avatar Artturin Committed by GitHub
Browse files

Merge pull request #269461 from Artturin/addcrossreplace 

config.replaceCrossStdenv: add
parents f8de5fbf b9e5637a

pkgs/stdenv/cross/default.nix

+40 −37
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ let 
    crossOverlays = [];



    # Ignore custom stdenvs when cross compiling for compatibility

    # Use replaceCrossStdenv instead.

    config = builtins.removeAttrs config [ "replaceStdenv" ];

  };
@@ -44,7 +45,8 @@ in lib.init bootStages ++ [ 
    inherit config;

    overlays = overlays ++ crossOverlays;

    selfBuild = false;

    stdenv = adaptStdenv (buildPackages.stdenv.override (old: rec {

    stdenv = let

      baseStdenv = adaptStdenv (buildPackages.stdenv.override (old: rec {

        buildPlatform = localSystem;

        hostPlatform = crossSystem;

        targetPlatform = crossSystem;
@@ -85,6 +87,7 @@ in lib.init bootStages ++ [ 
               buildPackages.updateAutotoolsGnuConfigScriptsHook

          ;

      }));

    in if config ? replaceCrossStdenv then config.replaceCrossStdenv { inherit buildPackages baseStdenv; } else baseStdenv;

  })



]