about summary refs log tree commit diff
path: root/pkgs/stdenv
diff options
context:
space:
mode:
authorJohn Ericson <mail@JohnEricson.me>2018-09-06 09:37:20 -0400
committerGitHub <noreply@github.com>2018-09-06 09:37:20 -0400
commit24209d29f08c9f0dfeffffd2b30d0aebd536341e (patch)
treedebf1bdbad8e3bf4fbe8977653bee473b34a7295 /pkgs/stdenv
parenta278414b32ad99bf11ce63c2ef0c970920bf761d (diff)
parent8ae27030aa4989d42f9335d4b80a5a4d3d6d039c (diff)
Merge pull request #46148 from obsidiansystems/plain-system-host
top-level, stdenv: Make `system` and `stdenv.system` describe the hostPlatform
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r--pkgs/stdenv/generic/default.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index ac727034b8e7e..be9d38f9780a6 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;