fixup! flake: add support for alternative architectures

Author: sespiros

flake.nix

@@ -36,18 +36,7 @@
           (import ./overlays/nixpkgs.nix)
         ];
 
-        # runtimePkgs is always x86_64-linux — the only supported runtime target.
-        # On x86_64-linux this is the same as pkgs; on other systems (e.g. darwin)
-        # the Nix daemon delegates builds to a remote x86_64-linux builder, producing
-        # identical store paths to native x86_64-linux builds.
-        runtimePkgs = import nixpkgs {
-          system = "x86_64-linux";
-          overlays = commonOverlays ++ [
-            (import ./overlays/contrast.nix)
-          ];
-          config.allowUnfree = true;
-          config.nvidia.acceptLicense = true;
-        };
+        runtimePkgs = self.legacyPackages.x86_64-linux;
 
         # mkSet creates a set of packages based on a given set of overlays.
         mkSet =
@@ -63,9 +52,9 @@
         setsFromDirectory =
           dir:
           builtins.listToAttrs (
-            map (file: {
+            map (file: rec {
               name = builtins.substring 0 (builtins.stringLength file - 4) (baseNameOf file);
-              value = mkSet (defaultOverlays ++ [ (import (dir + "/${file}")) ]);
+              value = mkSet ((defaultOverlays name) ++ [ (import (dir + "/${file}")) ]);
             }) (builtins.attrNames (builtins.readDir dir))
           );
 
@@ -83,10 +72,13 @@
             ];
           };
 
-        defaultOverlays = commonOverlays ++ [
-          (_final: _prev: { inherit runtimePkgs; })
-          (import ./overlays/contrast.nix)
-        ];
+        defaultOverlays =
+          set:
+          commonOverlays
+          ++ [
+            (_final: _prev: { runtimePkgs = runtimePkgs.${set}; })
+            (import ./overlays/contrast.nix)
+          ];
 
         sets = setsFromDirectory ./overlays/sets;
 

overlays/contrast.nix

@@ -4,8 +4,9 @@
 final: prev:
 
 let
-  # On x86_64-linux (inside runtimePkgs), runtimePkgs isn't in scope, use final (itself).
-  # On other systems (inside pkgs), runtimePkgs was injected by the flake overlay.
+  # runtimePkgs is injected by the flake overlay and provides
+  # the x86_64-linux set (via reverseContrastNesting), including
+  # set-specific overrides. On x86_64-linux it falls back to final.
   runtimePkgs = prev.runtimePkgs or final;
 
   baseContrastPkgs = import ../packages { pkgs = final; };
@@ -15,43 +16,33 @@ if prev.stdenv.hostPlatform.system == "x86_64-linux" then
 else
   {
     contrastPkgs = baseContrastPkgs.overrideScope (
-      cFinal: cPrev: {
-        mkNixosConfig = cPrev.mkNixosConfig.override {
-          pkgs = runtimePkgs;
-        };
-
-        kata = cPrev.kata // {
-          # Re-evaluate image to pick up the new mkNixosConfig
-          image = cFinal.callPackage ../packages/by-name/kata/image/package.nix { };
-
-          inherit (runtimePkgs.contrastPkgs.kata) contrast-node-installer-image agent kernel-uvm;
-        };
-
-        contrast =
-          let
-            runtimeContrast = runtimePkgs.contrastPkgs.contrast;
-
-            nativeContrast = {
-              cli = cFinal.callPackage ../packages/by-name/contrast/cli/package.nix {
-                inherit (cFinal.contrast) contrast reference-values;
-              };
-              cli-release = cFinal.callPackage ../packages/by-name/contrast/cli-release/package.nix {
-                inherit (cFinal.contrast) cli;
-              };
-              resourcegen = cFinal.callPackage ../packages/by-name/contrast/resourcegen/package.nix {
-                inherit (cFinal.contrast) contrast reference-values;
-              };
-              contrast = cFinal.callPackage ../packages/by-name/contrast/contrast/package.nix {
-                inherit (cFinal.contrast) reference-values;
-              };
-              e2e = cFinal.callPackage ../packages/by-name/contrast/e2e/package.nix {
-                inherit (cFinal.contrast) contrast;
-              };
-            };
-          in
-          runtimeContrast // nativeContrast;
-
-        inherit (runtimePkgs.contrastPkgs)
+      _cFinal: cPrev: {
+        kata = cPrev.kata.overrideScope (
+          _: _: {
+            inherit (runtimePkgs.kata)
+              contrast-node-installer-image
+              agent
+              image
+              kernel-uvm
+              ;
+          }
+        );
+
+        contrast = cPrev.contrast.overrideScope (
+          _: _: {
+            inherit (runtimePkgs.contrast)
+              coordinator
+              docs
+              initializer
+              node-installer-image
+              nodeinstaller
+              reference-values
+              snp-id-blocks
+              ;
+          }
+        );
+
+        inherit (runtimePkgs)
           debugshell
           tdx-tools
           service-mesh

packages/containers.nix

@@ -10,7 +10,7 @@
 }:
 
 let
-  runtimePkgs = pkgs.runtimePkgs or pkgs;
+  runtimePkgs = pkgs.runtimePkgs.nixpkgs or pkgs;
 
   pushOCIDir =
     name: dir: tag:

packages/scripts.nix

@@ -9,7 +9,7 @@
 }:
 
 let
-  runtimePkgs = pkgs.runtimePkgs or pkgs;
+  runtimePkgs = pkgs.runtimePkgs.nixpkgs or pkgs;
 in
 
 lib.makeScope pkgs.newScope (scripts: {