From 6980fd146d6921b53125e13e10967311ec8c855b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 11 Nov 2023 04:28:51 +0100 Subject: [PATCH] packages: fix cross nixos-rebuild --- packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages.nix b/packages.nix index 63fc50c6..5a2a49ba 100644 --- a/packages.nix +++ b/packages.nix @@ -96,7 +96,6 @@ lib.attrsets.mapAttrs target = ''root@"${host}"''; rebuildArg = "--flake ${self}#${name} ${overrideInputsArgs} --accept-flake-config"; hostConfig = self.nixosConfigurations."${name}".config; - hostPkgs = self.nixosConfigurations."${name}".pkgs; declaredRunnerDrvPath = discardStringCtx hostConfig.microvm.declaredRunner.drvPath; toplevelDrvPath = discardStringCtx hostConfig.system.build.toplevel.drvPath; toplevelOutPath = discardStringCtx hostConfig.system.build.toplevel.outPath; @@ -160,7 +159,7 @@ lib.attrsets.mapAttrs [[ ''${1:-} == build || $(ssh ${target} cat /etc/hostname) == ${name} ]] # 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" ''