1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +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:
mergify[bot] 2025-07-09 09:50:14 +00:00 committed by GitHub
commit ed8f7df56d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -184,11 +184,14 @@ let
} " = "; } " = ";
}; };
nixConfContents = toConf { nixConfContents = toConf (
sandbox = false; {
build-users-group = "nixbld"; sandbox = false;
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; build-users-group = "nixbld";
}; 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}";