mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(nix/emptyDerivation): Use system from readTree parameters

Browse source 
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>
This commit is contained in:
Vincent Ambo 2022-06-03 12:58:07 +00:00 committed by clbot
parent 6cfa6bb59e
commit 837560c846
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nix/emptyDerivation/default.nix
View file

@ -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 {

6
nix/emptyDerivation/emptyDerivation.nix
View file

@ -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 = [