From 2df990967be3c21f074c56682f8fa47bdd7cba7b Mon Sep 17 00:00:00 2001
From: John Ericson <jericson@galois.com>
Date: Wed, 30 Nov 2016 19:03:22 -0500
Subject: [PATCH] Move up `inherit` binding for consistency

---
 pkgs/stdenv/cross/default.nix  | 2 +-
 pkgs/stdenv/custom/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 4b7d81879b1..e48124f1c4d 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -17,10 +17,10 @@ rec {
   # be used to build compilers and other such tools targeting the cross
   # platform. Then, `forceNativeDrv` can be removed.
   buildPackages = allPackages {
+    inherit system platform crossSystem config;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
     bootStdenv = vanillaStdenv;
-    inherit system platform crossSystem config;
   };
 
   stdenvCross = buildPackages.makeStdenvCross
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index 6d2aa8c59b3..4c14d6411f1 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -7,10 +7,10 @@ rec {
   });
 
   buildPackages = allPackages {
+    inherit system platform crossSystem config;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
     bootStdenv = vanillaStdenv;
-    inherit system platform crossSystem config;
   };
 
   stdenvCustom = config.replaceStdenv { pkgs = buildPackages; };