colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

darwin.builder: allow overriding configuration

Browse Source
This commit is contained in:
Michael Hoang 2023-06-14 09:16:34 +10:00
parent 98d970bc37
commit 34f6ce2fc2
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/profiles/macos-builder.nix
View File

@ -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

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

@ -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 = [ ]; };
})