Unverified Commit 0784176a authored by jade's avatar jade Committed by GitHub
Browse files

darwin.linux-builder: split `create-builder` script (#406533)

parents 4f03c4d8 2263f723

nixos/modules/profiles/nix-builder-vm.nix

+16 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ in 


        hostPkgs = config.virtualisation.host.pkgs;



        script = hostPkgs.writeShellScriptBin "create-builder" (

        add-keys = hostPkgs.writeShellScriptBin "add-keys" (

          ''

            set -euo pipefail

          ''
@@ -191,10 +191,22 @@ 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")" ${lib.getExe config.system.build.vm}

          ''

        );



        run-builder = hostPkgs.writeShellScriptBin "run-builder" (''

          set -euo pipefail

          KEYS="''${KEYS:-./keys}"

          KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm}

        '');



        script = hostPkgs.writeShellScriptBin "create-builder" (''

          set -euo pipefail

          export KEYS="''${KEYS:-./keys}"

          ${lib.getExe add-keys}

          ${lib.getExe run-builder}

        '');



      in

      script.overrideAttrs (old: {

        pos = __curPos; # sets meta.position to point here; see script binding above for package definition
@@ -205,6 +217,8 @@ in 
          # Let users in the repl inspect the config

          nixosConfig = config;

          nixosOptions = options;



          inherit add-keys run-builder;

        };

      });