From 6dc6c76757454e823f11d45066dc1fd28bd53305 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Thu, 20 Feb 2025 22:37:00 +0400
Subject: [PATCH] trick nix and devenv into building x86 packages

---
 agents/macos.nix          |  2 +-
 flake.nix                 |  2 ++
 modules/github-runner.nix | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/agents/macos.nix b/agents/macos.nix
index cdd1bac..b52d9a8 100644
--- a/agents/macos.nix
+++ b/agents/macos.nix
@@ -28,7 +28,7 @@
       githubOrganization = "cachix";
       namePrefix = "cachix-x86_64-darwin-rosetta-";
       tokenFile = config.age.secrets.github-runner-token.path;
-      extraPackages = [ pkgs.devenv ];
+      extraPackages = [ pkgs.devenv-x86 ];
     };
   };
 
diff --git a/flake.nix b/flake.nix
index 01889b1..ad3ffce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,6 +71,8 @@
               cachix = cachix-flake.packages.${system}.default;
               devenv = devenv.packages.${system}.devenv;
               unstable = nixpkgs-unstable.legacyPackages.${system};
+            } // lib.optionalAttrs (system == "aarch64-darwin") {
+              devenv-x86 = devenv.packages.x86_64-darwin.devenv;
             })
           ];
         };
diff --git a/modules/github-runner.nix b/modules/github-runner.nix
index 7020579..1c33ed1 100644
--- a/modules/github-runner.nix
+++ b/modules/github-runner.nix
@@ -182,11 +182,11 @@ in
             ];
           }
           (lib.mkIf cfg.rosetta.enable {
-            package =
-              let
-                wrapX86Program = pkgs.callPackage ../lib/wrap-x86-program.nix { };
-              in
-              wrapX86Program pkgs.pkgsx86_64Darwin.github-runner;
+            extraEnvironment = {
+              "NIX_USER_CONF_FILES" = "${pkgs.writeText "x86-nix-user-conf" ''
+                system = x86_64-darwin
+              ''}";
+            };
           })
           (lib.mkIf pkgs.stdenv.isLinux { user = runnerName; })
           cfg.extraService