about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsterni <sternenseemann@systemli.org>2022-06-03T23·35+0200
committerclbot <clbot@tvl.fyi>2022-06-03T23·50+0000
commit7fea2bdc456f9d5a0b827f23706fc414d986adcb (patch)
tree79a0abcdaf9e2abec7e59f7e4713edc3a3272162
parent837560c846eeeb6867402042f047a5224626211e (diff)
fix(3p/nixpkgs): pass localSystem from depot to nixpkgs r/4209
Change-Id: I75d2ad14ebc81a76cfa7c8d83e77b4a124b03466
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5846
Autosubmit: sterni <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
-rw-r--r--third_party/nixpkgs/default.nix9
1 files changed, 8 insertions, 1 deletions
diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix
index 3471468c4c..4007d00f9d 100644
--- a/third_party/nixpkgs/default.nix
+++ b/third_party/nixpkgs/default.nix
@@ -8,7 +8,12 @@
 # in //default.nix passes this attribute as the `pkgs` argument to all
 # readTree derivations.
 
-{ depot ? { }, externalArgs ? { }, depotOverlays ? true, ... }:
+{ depot ? { }
+, externalArgs ? { }
+, depotOverlays ? true
+, localSystem ? builtins.currentSystem
+, ...
+}:
 
 let
   # import the nixos-unstable package set, or optionally use the
@@ -48,6 +53,8 @@ import nixpkgsSrc {
       allowBroken = true;
     };
 
+  inherit localSystem;
+
   overlays = [
     commitsOverlay
     stableOverlay