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

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

Browse Source 
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
parent 248d460d6f 18c8866f77
commit fdbcba838e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/stdenv/generic/default.nix
+5 -2
View File
@@ -138,8 +138,11 @@ let
is32bit is64bit is32bit is64bit
isAarch32 isAarch64 isMips isBigEndian; isAarch32 isAarch64 isMips isBigEndian;
# The derivation's `system` is `buildPlatform.system`. # Override `system` so that packages can get the system of the host
inherit (buildPlatform) system; # 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 (import ./make-derivation.nix {
inherit lib config stdenv; inherit lib config stdenv;