about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--default.nix3
-rw-r--r--third_party/nixpkgs/default.nix3
2 files changed, 4 insertions, 2 deletions
diff --git a/default.nix b/default.nix
index 0cb74ee731d7..c4db2fa58017 100644
--- a/default.nix
+++ b/default.nix
@@ -6,6 +6,7 @@
 , parentTargetMap ? null
 , nixpkgsConfig ? { }
 , localSystem ? builtins.currentSystem
+, crossSystem ? null
 , ...
 }@args:
 
@@ -78,7 +79,7 @@ let
 
 in
 readTree.fix (self: (readDepot {
-  inherit localSystem;
+  inherit localSystem crossSystem;
   depot = self;
 
   # Pass third_party as 'pkgs' (for compatibility with external
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 3fc2aaf7a8fd..84bd500cbf7f 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -12,6 +12,7 @@
 , externalArgs ? { }
 , depotOverlays ? true
 , localSystem ? externalArgs.localSystem or builtins.currentSystem
+, crossSystem ? externalArgs.crossSystem or localSystem
 , ...
 }:
 
@@ -31,7 +32,7 @@ let
         checkMeta = false;
       };
 
-    inherit localSystem;
+    inherit localSystem crossSystem;
   };
 
   # import the nixos-unstable package set, or optionally use the