about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2022-06-03T12·58+0000
committerclbot <clbot@tvl.fyi>2022-06-03T23·27+0000
commit837560c846eeeb6867402042f047a5224626211e (patch)
tree162384d281b2fe5fcf5199df832fec1664f8b1e1
parent6cfa6bb59e541175204b37ccb42baabfa7e49204 (diff)
fix(nix/emptyDerivation): Use system from readTree parameters r/4208
Change-Id: Ia7f9f4d0e7c06fa5433213a315c3354a83e94545
Reviewed-on: https://cl.tvl.fyi/c/depot/+/5833
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: Profpatsch <mail@profpatsch.de>
-rw-r--r--nix/emptyDerivation/default.nix3
-rw-r--r--nix/emptyDerivation/emptyDerivation.nix6
2 files changed, 4 insertions, 5 deletions
diff --git a/nix/emptyDerivation/default.nix b/nix/emptyDerivation/default.nix
index 843398401..f808aa228 100644
--- a/nix/emptyDerivation/default.nix
+++ b/nix/emptyDerivation/default.nix
@@ -1,10 +1,11 @@
-{ depot, pkgs, ... }:
+{ depot, pkgs, localSystem, ... }:
 
 let
   emptyDerivation = import ./emptyDerivation.nix {
     inherit pkgs;
     inherit (pkgs) stdenv;
     inherit (depot.nix) getBins;
+    system = localSystem;
   };
 
   tests = import ./tests.nix {
diff --git a/nix/emptyDerivation/emptyDerivation.nix b/nix/emptyDerivation/emptyDerivation.nix
index 772df9635..d7de7ccfb 100644
--- a/nix/emptyDerivation/emptyDerivation.nix
+++ b/nix/emptyDerivation/emptyDerivation.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgs, getBins }:
+{ stdenv, system, pkgs, getBins }:
 
 # The empty derivation. All it does is touch $out.
 # Basically the unit value for derivations.
@@ -15,9 +15,7 @@ let
 
   emptiness = {
     name = "empty-derivation";
-
-    # TODO(Profpatsch): can we get system from tvl?
-    inherit (stdenv) system;
+    inherit system;
 
     builder = bins.exec;
     args = [