diff options
author | John Ericson <mail@JohnEricson.me> | 2018-09-06 09:37:20 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-06 09:37:20 -0400 |
commit | 24209d29f08c9f0dfeffffd2b30d0aebd536341e (patch) | |
tree | debf1bdbad8e3bf4fbe8977653bee473b34a7295 | |
parent | a278414b32ad99bf11ce63c2ef0c970920bf761d (diff) | |
parent | 8ae27030aa4989d42f9335d4b80a5a4d3d6d039c (diff) | |
download | nixpkgs-24209d29f08c9f0dfeffffd2b30d0aebd536341e.tar nixpkgs-24209d29f08c9f0dfeffffd2b30d0aebd536341e.tar.gz nixpkgs-24209d29f08c9f0dfeffffd2b30d0aebd536341e.tar.bz2 nixpkgs-24209d29f08c9f0dfeffffd2b30d0aebd536341e.tar.lz nixpkgs-24209d29f08c9f0dfeffffd2b30d0aebd536341e.tar.xz nixpkgs-24209d29f08c9f0dfeffffd2b30d0aebd536341e.tar.zst nixpkgs-24209d29f08c9f0dfeffffd2b30d0aebd536341e.zip |
Merge pull request #46148 from obsidiansystems/plain-system-host
top-level, stdenv: Make `system` and `stdenv.system` describe the hostPlatform
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1809.xml | 8 | ||||
-rw-r--r-- | pkgs/stdenv/generic/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/stage.nix | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1809.xml b/nixos/doc/manual/release-notes/rl-1809.xml index 30e98a23bdf..63775d503c9 100644 --- a/nixos/doc/manual/release-notes/rl-1809.xml +++ b/nixos/doc/manual/release-notes/rl-1809.xml @@ -283,6 +283,14 @@ $ nix-instantiate -E '(import <nixpkgsunstable> {}).gitFull' from your config without any issues. </para> </listitem> + <listitem> + <para> + <literal>stdenv.system</literal> and <literal>system</literal> in nixpkgs now refer to the host platform instead of the build platform. + For native builds this is not change, let alone a breaking one. + For cross builds, it is a breaking change, and <literal>stdenv.buildPlatform.system</literal> can be used instead for the old behavior. + They should be using that anyways for clarity. + </para> + </listitem> </itemizedlist> </section> diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index ac727034b8e..be9d38f9780 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -127,6 +127,9 @@ let "`stdenv.isArm` is deprecated after 18.03. Please use `stdenv.isAarch32` instead" hostPlatform.isAarch32; + # The derivation's `system` is `buildPlatform.system`. + inherit (buildPlatform) system; + # Whether we should run paxctl to pax-mark binaries. needsPax = isLinux; diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 5ca8b72b8b8..ff09fa5ad1f 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -89,7 +89,7 @@ let targetPlatform = lib.warn "top-level `targetPlatform` is deprecated since 18.09. Please use `stdenv.targetPlatform`." super.stdenv.targetPlatform; - inherit (super.stdenv.buildPlatform) system; + inherit (super.stdenv.hostPlatform) system; }; splice = self: super: import ./splice.nix lib self (buildPackages != null); |