Merge pull request #92961 from lopsided98/stdenv-system-fix

stdenv: correctly make `stdenv.system` refer to the host platform
This commit is contained in:
John Ericson 2020-07-11 16:19:55 -04:00 committed by GitHub
commit fdbcba838e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -138,8 +138,11 @@ let
is32bit is64bit
isAarch32 isAarch64 isMips isBigEndian;
# The derivation's `system` is `buildPlatform.system`.
inherit (buildPlatform) system;
# Override `system` so that packages can get the system of the host
# platform through `stdenv.system`. `system` is originally set to the
# build platform within the derivation above so that Nix directs the build
# to correct type of machine.
inherit (hostPlatform) system;
inherit (import ./make-derivation.nix {
inherit lib config stdenv;