From 34f6ce2fc2db08bf86022f47975d23e625843d2a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 14 Jun 2023 09:16:34 +1000 Subject: [PATCH] darwin.builder: allow overriding configuration --- nixos/modules/profiles/macos-builder.nix | 2 +- pkgs/top-level/darwin-packages.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/profiles/macos-builder.nix b/nixos/modules/profiles/macos-builder.nix index 7ed68f06476b..554115705b64 100644 --- a/nixos/modules/profiles/macos-builder.nix +++ b/nixos/modules/profiles/macos-builder.nix @@ -157,7 +157,7 @@ in if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}") fi - KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${config.system.build.vm}/bin/run-nixos-vm + KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm} ''); in diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index fa03c385e4f3..a583b84b430d 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -229,7 +229,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { }; # See doc/builders/special/darwin-builder.section.md - builder = + builder = lib.makeOverridable ({ modules }: let toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ]; @@ -237,7 +237,7 @@ impure-cmds // appleSourcePackages // chooseLibs // { configuration = { imports = [ ../../nixos/modules/profiles/macos-builder.nix - ]; + ] ++ modules; virtualisation.host = { inherit pkgs; }; }; @@ -246,5 +246,5 @@ impure-cmds // appleSourcePackages // chooseLibs // { }; in - nixos.config.system.build.macos-builder-installer; + nixos.config.system.build.macos-builder-installer) { modules = [ ]; }; })