Merge pull request #207459 from Gabriella439/gabriella/darwin_builder_platforms
darwin.builder: Fix supported platforms
This commit is contained in:
commit
2054bb5de5
@ -1,4 +1,4 @@
|
|||||||
{ config, pkgs, ... }:
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
keysDirectory = "/var/keys";
|
keysDirectory = "/var/keys";
|
||||||
@ -71,8 +71,7 @@ in
|
|||||||
|
|
||||||
hostPkgs = config.virtualisation.host.pkgs;
|
hostPkgs = config.virtualisation.host.pkgs;
|
||||||
|
|
||||||
in
|
script = hostPkgs.writeShellScriptBin "create-builder" ''
|
||||||
hostPkgs.writeShellScriptBin "create-builder" ''
|
|
||||||
KEYS="''${KEYS:-./keys}"
|
KEYS="''${KEYS:-./keys}"
|
||||||
${hostPkgs.coreutils}/bin/mkdir --parent "''${KEYS}"
|
${hostPkgs.coreutils}/bin/mkdir --parent "''${KEYS}"
|
||||||
PRIVATE_KEY="''${KEYS}/${user}_${keyType}"
|
PRIVATE_KEY="''${KEYS}/${user}_${keyType}"
|
||||||
@ -87,6 +86,13 @@ in
|
|||||||
KEYS="$(nix-store --add "$KEYS")" ${config.system.build.vm}/bin/run-nixos-vm
|
KEYS="$(nix-store --add "$KEYS")" ${config.system.build.vm}/bin/run-nixos-vm
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
in
|
||||||
|
script.overrideAttrs (old: {
|
||||||
|
meta = (old.meta or { }) // {
|
||||||
|
platforms = lib.platforms.darwin;
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
system.stateVersion = "22.05";
|
system.stateVersion = "22.05";
|
||||||
|
|
||||||
users.users."${user}"= {
|
users.users."${user}"= {
|
||||||
|
Loading…
Reference in New Issue
Block a user