nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-30 22:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

doc: fix darwin-builder doc (#291518)

Browse Source
This commit is contained in:
yihuang 2024-02-28 22:36:13 +08:00 committed by GitHub
parent 82a985a918
commit 267735f785
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/packages/darwin-builder.section.md
View File

@ -97,6 +97,7 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
{ virtualisation = { { virtualisation = {
host.pkgs = pkgs; host.pkgs = pkgs;
darwin-builder.workingDirectory = "/var/lib/darwin-builder"; darwin-builder.workingDirectory = "/var/lib/darwin-builder";
darwin-builder.hostPort = 22;
}; };
} }
]; ];
@ -110,7 +111,9 @@ $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
{ {
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.buildMachines = [{ nix.buildMachines = [{
hostName = "ssh://builder@localhost"; hostName = "localhost";
sshUser = "builder";
sshKey = "/etc/nix/builder_ed25519";
system = linuxSystem; system = linuxSystem;
maxJobs = 4; maxJobs = 4;
supportedFeatures = [ "kvm" "benchmark" "big-parallel" ]; supportedFeatures = [ "kvm" "benchmark" "big-parallel" ];

2
pkgs/top-level/darwin-packages.nix
View File

@ -234,7 +234,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { };
# See doc/builders/special/darwin-builder.section.md # See doc/packages/darwin-builder.section.md
linux-builder = lib.makeOverridable ({ modules }: linux-builder = lib.makeOverridable ({ modules }:
let let
toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ]; toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ];