From 2685c91dd93b7c9a1f5f980758269c3a278634dc Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 5 Aug 2023 00:38:37 +0000
Subject: [PATCH] cross: build mepo without emulating as many packages

---
 overlays/cross.nix | 94 ++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 82 insertions(+), 12 deletions(-)

diff --git a/overlays/cross.nix b/overlays/cross.nix
index 3d0159b7..1df686f4 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -739,18 +739,88 @@ in {
     # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [ final.pkg-config ];
   });
 
-  mepo = (prev.mepo.override {
-    # emulate zig and stdenv to fix:
-    # - "/build/source/src/sdlshim.zig:1:20: error: C import failed"
-    # emulate makeWrapper to fix:
-    # - "error: makeWrapper/makeShellWrapper must be in nativeBuildInputs"
-    inherit (emulated) makeWrapper stdenv zig;
-  }).overrideAttrs (upstream: {
-    nativeBuildInputs = [ final.pkg-config emulated.makeWrapper ];
-    # ref to zig by full path because otherwise it doesn't end up on the path...
-    checkPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.checkPhase;
-    installPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.installPhase;
-  });
+  mepo =
+    # let
+    #   zig = final.zig.override {
+    #     inherit (emulated) stdenv;
+    #   };
+    #   # makeWrapper = final.makeWrapper.override {
+    #   #   inherit (emulated) stdenv;
+    #   # };
+    #   # makeWrapper = emulated.stdenv.mkDerivation final.makeWrapper;
+    # in
+    # (prev.mepo.overrideAttrs (upstream: {
+    #   checkPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.checkPhase;
+    #   installPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.installPhase;
+    # })).override {
+    #   inherit (emulated) stdenv;
+    #   inherit zig;
+    # };
+    final.callPackage ({
+      stdenv
+      , upstreamMepo
+      , makeWrapper
+      , pkg-config
+      , zig
+      # buildInputs
+      , curl
+      , SDL2
+      , SDL2_gfx
+      , SDL2_image
+      , SDL2_ttf
+      , jq
+      , ncurses
+    }: stdenv.mkDerivation {
+      inherit (upstreamMepo)
+        pname
+        version
+        src
+        # buildInputs
+        preBuild
+        doCheck
+        postInstall
+        meta
+      ;
+      # moves pkg-config to buildInputs where zig can see it, and uses the host build of zig.
+      nativeBuildInputs = [ makeWrapper ];
+      buildInputs = [
+        curl SDL2 SDL2_gfx SDL2_image SDL2_ttf jq ncurses pkg-config
+      ];
+      checkPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstreamMepo.checkPhase;
+      installPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstreamMepo.installPhase;
+    }) {
+      upstreamMepo = prev.mepo;
+      inherit (emulated) stdenv;
+      zig = useEmulatedStdenv final.zig;
+    };
+    # (prev.mepo.override {
+    #   # emulate zig and stdenv to fix:
+    #   # - "/build/source/src/sdlshim.zig:1:20: error: C import failed"
+    #   # emulate makeWrapper to fix:
+    #   # - "error: makeWrapper/makeShellWrapper must be in nativeBuildInputs"
+    #   # inherit (emulated) makeWrapper stdenv;
+    #   inherit (emulated) stdenv;
+    #   inherit zig;
+    #   # inherit makeWrapper;
+    # }).overrideAttrs (upstream: {
+    #   # nativeBuildInputs = [ final.pkg-config makeWrapper ];
+    #   # nativeBuildInputs = [ final.pkg-config emulated.makeWrapper ];
+    #   # ref to zig by full path because otherwise it doesn't end up on the path...
+    #   #checkPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.checkPhase;
+    #   #installPhase = lib.replaceStrings [ "zig" ] [ "${zig}/bin/zig" ] upstream.installPhase;
+    # });
+  # mepo = (prev.mepo.override {
+  #   # emulate zig and stdenv to fix:
+  #   # - "/build/source/src/sdlshim.zig:1:20: error: C import failed"
+  #   # emulate makeWrapper to fix:
+  #   # - "error: makeWrapper/makeShellWrapper must be in nativeBuildInputs"
+  #   inherit (emulated) makeWrapper stdenv zig;
+  # }).overrideAttrs (upstream: {
+  #   nativeBuildInputs = [ final.pkg-config emulated.makeWrapper ];
+  #   # ref to zig by full path because otherwise it doesn't end up on the path...
+  #   checkPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.checkPhase;
+  #   installPhase = lib.replaceStrings [ "zig" ] [ "${emulated.zig}/bin/zig" ] upstream.installPhase;
+  # });
   # mepo = (prev.mepo.override {
   #   inherit (emulated) stdenv;
   # }).overrideAttrs (upstream: {