From 9eb9fdec6c5cc008b2a48ec1b105dae6e69abe4e Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Thu, 30 Apr 2026 17:18:36 -0500 Subject: [PATCH] chore: try allowing nix darwin builds --- darwin/baseline.nix | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/darwin/baseline.nix b/darwin/baseline.nix index 98616dc..22914f5 100644 --- a/darwin/baseline.nix +++ b/darwin/baseline.nix @@ -1,23 +1,32 @@ { - lib, pkgs, top, ... }: let - builder-config = { - darwin-aarch-builder = top.self.nixosConfigurations.builder-aarch; - darwin-x86-builder = top.self.nixosConfigurations.builder-x86; + system = builtins.replaceStrings [ "darwin" ] [ "linux" ] pkgs.stdenv.hostPlatform.system; + builderConfig = top.nixunstable.lib.nixosSystem { + inherit system; + modules = [ + "${top.nixunstable}/nixos/modules/profiles/nix-builder-vm.nix" + { + virtualisation = { + host.pkgs = pkgs; + darwin-builder = { + workingDirectory = "/var/lib/darwin-builder"; + hostPort = 22; + }; + }; + } + ]; }; - builder = arch: let - b = builder-config."darwin-${arch}-builder"; - in { - command = "${b.config.system.build.macos-builder-installer}/bin/create-builder"; + builder = { + command = "${builderConfig.config.system.build.macos-builder-installer}/bin/create-builder"; serviceConfig = { KeepAlive = true; RunAtLoad = true; - StandardOutPath = "/var/log/builder-vm-${arch}.log"; - StandardErrorPath = "/var/log/builder-vm-${arch}.stderr.log"; + StandardOutPath = "/var/log/builder-vm-${system}.log"; + StandardErrorPath = "/var/log/builder-vm-${system}.stderr.log"; }; }; in @@ -32,6 +41,8 @@ in nerd-fonts.hack ]; + launchd.daemons.darwin-builder = builder; + nix = { enable = true; gc.interval.Hour = 3;