packages: fix cross nixos-rebuild
This commit is contained in:
parent
345b3a5a9d
commit
6980fd146d
|
@ -96,7 +96,6 @@ lib.attrsets.mapAttrs
|
||||||
target = ''root@"${host}"'';
|
target = ''root@"${host}"'';
|
||||||
rebuildArg = "--flake ${self}#${name} ${overrideInputsArgs} --accept-flake-config";
|
rebuildArg = "--flake ${self}#${name} ${overrideInputsArgs} --accept-flake-config";
|
||||||
hostConfig = self.nixosConfigurations."${name}".config;
|
hostConfig = self.nixosConfigurations."${name}".config;
|
||||||
hostPkgs = self.nixosConfigurations."${name}".pkgs;
|
|
||||||
declaredRunnerDrvPath = discardStringCtx hostConfig.microvm.declaredRunner.drvPath;
|
declaredRunnerDrvPath = discardStringCtx hostConfig.microvm.declaredRunner.drvPath;
|
||||||
toplevelDrvPath = discardStringCtx hostConfig.system.build.toplevel.drvPath;
|
toplevelDrvPath = discardStringCtx hostConfig.system.build.toplevel.drvPath;
|
||||||
toplevelOutPath = discardStringCtx hostConfig.system.build.toplevel.outPath;
|
toplevelOutPath = discardStringCtx hostConfig.system.build.toplevel.outPath;
|
||||||
|
@ -160,7 +159,7 @@ lib.attrsets.mapAttrs
|
||||||
|
|
||||||
[[ ''${1:-} == build || $(ssh ${target} cat /etc/hostname) == ${name} ]]
|
[[ ''${1:-} == build || $(ssh ${target} cat /etc/hostname) == ${name} ]]
|
||||||
# don't re-execute, otherwise we run the targetPlatform locally
|
# don't re-execute, otherwise we run the targetPlatform locally
|
||||||
_NIXOS_REBUILD_REEXEC=1 ${lib.getExe hostPkgs.nixos-rebuild} ${rebuildArg} --target-host ${target} --use-remote-sudo "$@"
|
_NIXOS_REBUILD_REEXEC=1 ${lib.getExe pkgs.nixos-rebuild} ${rebuildArg} --target-host ${target} --use-remote-sudo "$@"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
"${name}-cleanup" = pkgs.writeScriptBin "${name}-cleanup" ''
|
"${name}-cleanup" = pkgs.writeScriptBin "${name}-cleanup" ''
|
||||||
|
|
Loading…
Reference in New Issue