Better linux cross

Author: angerman

overlays/linux-cross.nix

@@ -42,14 +42,21 @@ let
       writeShellScriptBin ("iserv-wrapper" + lib.optionalString enableProfiling "-prof") ''
     #!${stdenv.shell}
     set -euo pipefail
+    ISERV_ARGS=''${ISERV_ARGS:-}
+    PROXY_ARGS=''${PROXY_ARGS:-}
     # Unset configure flags as configure should have run already
     unset configureFlags
     PORT=$((5000 + $RANDOM % 5000))
     (>&2 echo "---> Starting ${interpreter.exeName} on port $PORT")
-    ${qemu}/bin/qemu-${qemuSuffix} ${interpreter.override (lib.optionalAttrs hostPlatform.isAndroid { setupBuildFlags = ["--ghc-option=-optl-static" ] ++ lib.optional hostPlatform.isAarch32 "--ghc-option=-optl-no-pie";})}/bin/${interpreter.exeName} tmp $PORT &
+    ${qemu}/bin/qemu-${qemuSuffix} ${interpreter.override
+      (lib.optionalAttrs hostPlatform.isAndroid {
+        setupBuildFlags = ["--ghc-option=-optl-static" ] ++ lib.optional hostPlatform.isAarch32 "--ghc-option=-optl-no-pie";
+        patches = [ ./patches/iserv-proxy-interpreter-9.3-android.patch ];
+        enableDebugRTS = true;
+        })}/bin/${interpreter.exeName} tmp $PORT $ISERV_ARGS &
     (>&2 echo "---| ${interpreter.exeName} should have started on $PORT")
     RISERV_PID="$!"
-    ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT"
+    ${iserv-proxy}/bin/iserv-proxy $@ 127.0.0.1 "$PORT" $PROXY_ARGS
     (>&2 echo "---> killing ${interpreter.exeName}...")
     kill $RISERV_PID
     '';