From a820a476698415f680052f5c05c103b888631b9b Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 12 Mar 2023 14:20:06 +0000
Subject: [PATCH] 3p: plumb current system through tvl

---
 third_party/default.nix                         | 2 +-
 third_party/tvl/default.nix                     | 1 +
 third_party/tvl/third_party/nixpkgs/default.nix | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/third_party/default.nix b/third_party/default.nix
index 73b8374670..86d98c6fbd 100644
--- a/third_party/default.nix
+++ b/third_party/default.nix
@@ -43,7 +43,7 @@ let
     sha256 = "sha256:0qjyfmw5v7s6ynjns4a61vlyj9cghj7vbpgrp9147ngb1f8krz2c";
   };
 
-  tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; };
+  tvlDepot = import ./tvl { nixpkgsBisectPath = ./nixpkgs; inherit nixpkgsConfig; nixpkgsSystem = system; };
 in
 rec {
   inherit nixpkgsConfig nixpkgs;
diff --git a/third_party/tvl/default.nix b/third_party/tvl/default.nix
index 7cdf32bef9..d11267d647 100644
--- a/third_party/tvl/default.nix
+++ b/third_party/tvl/default.nix
@@ -5,6 +5,7 @@
 { nixpkgsBisectPath ? null
 , parentTargetMap ? null
 , nixpkgsConfig ? { }
+, nixpkgsSystem ? builtins.currentSystem
 , ...
 }@args:
 
diff --git a/third_party/tvl/third_party/nixpkgs/default.nix b/third_party/tvl/third_party/nixpkgs/default.nix
index 3471468c4c..50bdcb8afe 100644
--- a/third_party/tvl/third_party/nixpkgs/default.nix
+++ b/third_party/tvl/third_party/nixpkgs/default.nix
@@ -47,6 +47,7 @@ import nixpkgsSrc {
       allowUnfree = true;
       allowBroken = true;
     };
+  system = if externalArgs ? nixpkgsSystem then externalArgs.nixpkgsSystem else builtins.currentSystem;
 
   overlays = [
     commitsOverlay