Skip to content

Commit 28697a6

Browse files
committed
cicero job: put mac builders nix config in file
instead of NIX_CONFIG so that actions can freely set that variable
1 parent acfbad4 commit 28697a6

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

nix/cloud/nomadEnvs/cicero/default.nix

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,15 @@
116116
'';
117117
}
118118
{
119-
DestPath = "\${NOMAD_TASK_DIR}/darwin-nix-remote-builders.env";
120-
Envvars = true;
119+
# this will be changed to DestPath in the transformer
120+
DestPathInHome = ".config/nix/nix.conf";
121+
121122
EmbeddedTmpl = let
122123
builder = i: ''ssh://builder@10.10.0.${toString i} x86_64-darwin /secrets/id_buildfarm 4 2 big-parallel - {{index .Data.data "darwin${toString i}-public" | base64Encode}}'';
123124
in ''
124125
{{with secret "kv/data/cicero/darwin"}}
125-
NIX_CONFIG="builders = ${builder 1} ; ${builder 2}\nbuilders-use-substitutes = true"
126+
builders = ${builder 1} ; ${builder 2}
127+
builders-use-substitutes = true
126128
{{end}}
127129
'';
128130
}

0 commit comments

Comments
 (0)