Use static linking for android tests

Author: hamishmack

lib/check.nix

@@ -1,7 +1,10 @@
 { stdenv, lib, haskellLib, buildPackages }:
-let self = drv:
+let self = drvOrig:
 
 let
+  # Work around problem running dynamicially linked Android executables with qemu.
+  drv = drvOrig.override (lib.optionalAttrs stdenv.hostPlatform.isAndroid { setupBuildFlags = ["--ghc-option=-optl-static" ]; });
+
   component = drv.config;
 
 # This derivation can be used to execute test component.
@@ -65,4 +68,4 @@ in stdenv.mkDerivation ((
 }
 // lib.optionalAttrs (drv ? LOCALE_ARCHIVE) { inherit (drv) LOCALE_ARCHIVE; }
 );
-in self
+in self

overlays/linux-cross.nix

@@ -68,22 +68,14 @@ let
        # Also for GHC #15275
     ++ lib.optionals hostPlatform.isAarch64 ["--gcc-option=-fPIC"];
 
-  # Wrapper to output a warning for Android
-  qemuNotSupportedWarning = writeShellScriptBin "warning-wrapper" ''
-    echo "Warning: Running Android apps on Linux using qemu is not supported." >&2
-  '';
-
   # Wrapper for qemu testing
   qemuTestWrapper = writeShellScriptBin "test-wrapper" ''
     set -euo pipefail
     ${qemu}/bin/qemu-${qemuSuffix} $@*
   '';
 
   # Choose the appropriate test wrapper
-  testWrapper = lib.optional isLinuxCross
-    (if hostPlatform.isAndroid
-      then "${qemuNotSupportedWarning}/bin/warning-wrapper"
-      else "${qemuTestWrapper}/bin/test-wrapper");
+  testWrapper = lib.optional isLinuxCross "${qemuTestWrapper}/bin/test-wrapper";
 
   enableShared = lib.mkDefault (!isLinuxCross);