Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 248d460d6f60
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fdbcba838e09
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 11, 2020

  1. stdenv: correctly make stdenv.system refer to the host platform 

    This was supposed to be done in 773233c, but was not due to a small
mistake.
    @lopsided98
    lopsided98 committed Jul 11, 2020
    Copy the full SHA
    18c8866 View commit details

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

    stdenv: correctly make `stdenv.system` refer to the host platform
    @Ericson2314
    Ericson2314 authored Jul 11, 2020
    Copy the full SHA
    fdbcba8 View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 pkgs/stdenv/generic/default.nix
7 changes: 5 additions & 2 deletions pkgs/stdenv/generic/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;