From 837560c846eeeb6867402042f047a5224626211e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 3 Jun 2022 12:58:07 +0000 Subject: fix(nix/emptyDerivation): Use system from readTree parameters Change-Id: Ia7f9f4d0e7c06fa5433213a315c3354a83e94545 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5833 Tested-by: BuildkiteCI Autosubmit: tazjin Reviewed-by: Profpatsch --- nix/emptyDerivation/default.nix | 3 ++- nix/emptyDerivation/emptyDerivation.nix | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'nix') diff --git a/nix/emptyDerivation/default.nix b/nix/emptyDerivation/default.nix index 8433984012..f808aa228d 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 772df96352..d7de7ccfbc 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 = [ -- cgit 1.4.1