summary refs log tree commit diff
path: root/pkgs/stdenv/adapters.nix
diff options
context:
space:
mode:
authorJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-05 21:47:48 -0400
committerJohn Ericson <John.Ericson@Obsidian.Systems>2017-07-07 12:55:02 -0400
commita302d7360f201cc4fcfb4a43a432b31536795507 (patch)
tree29df099a1fabe012311c9db0ce7488b2f53f95f1 /pkgs/stdenv/adapters.nix
parentafc20239939829490e2d7a3beb7028b7c1dcc803 (diff)
downloadnixlib-a302d7360f201cc4fcfb4a43a432b31536795507.tar
nixlib-a302d7360f201cc4fcfb4a43a432b31536795507.tar.gz
nixlib-a302d7360f201cc4fcfb4a43a432b31536795507.tar.bz2
nixlib-a302d7360f201cc4fcfb4a43a432b31536795507.tar.lz
nixlib-a302d7360f201cc4fcfb4a43a432b31536795507.tar.xz
nixlib-a302d7360f201cc4fcfb4a43a432b31536795507.tar.zst
nixlib-a302d7360f201cc4fcfb4a43a432b31536795507.zip
top-level: {build,host,target}Platform are defined in the stdenv instead
See #27069 for a discussion of this
Diffstat (limited to 'pkgs/stdenv/adapters.nix')
-rw-r--r--pkgs/stdenv/adapters.nix8
1 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 7515a72fcfdf..5848ee87b1b0 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -61,11 +61,9 @@ rec {
                     , buildPlatform, hostPlatform, targetPlatform
                     } @ overrideArgs: let
     stdenv = overrideArgs.stdenv.override {
-      # TODO(@Ericson2314): Cannot do this for now because then Nix thinks the
-      # resulting derivation should be built on the host platform.
-      #hostPlatform = buildPlatform;
-      #targetPlatform = hostPlatform;
-      inherit cc;
+      inherit
+        buildPlatform hostPlatform targetPlatform
+        cc;
 
       allowedRequisites = null;