mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 20:16:03 +01:00
Merge pull request #13436 from NixOS/mergify/bp/2.30-maintenance/pr-13435
docker: fix nixConf (backport #13435)
This commit is contained in:
commit
ed8f7df56d
1 changed files with 8 additions and 5 deletions
|
|
@ -184,11 +184,14 @@ let
|
||||||
} " = ";
|
} " = ";
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfContents = toConf {
|
nixConfContents = toConf (
|
||||||
|
{
|
||||||
sandbox = false;
|
sandbox = false;
|
||||||
build-users-group = "nixbld";
|
build-users-group = "nixbld";
|
||||||
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
|
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
|
||||||
};
|
}
|
||||||
|
// nixConf
|
||||||
|
);
|
||||||
|
|
||||||
userHome = if uid == 0 then "/root" else "/home/${uname}";
|
userHome = if uid == 0 then "/root" else "/home/${uname}";
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue