Reunification with NixOS/nixpkgs

android-activity/github.json

@@ -1,6 +1,6 @@
 {
   "owner": "obsidiansystems",
   "repo": "android-activity",
-  "rev": "ac9dea4fc72604e8f82885dafcf17811d9a7c948",
-  "sha256": "19smn1vg3l41bs6b21qccj80dvy7nhziyisa000aphx3y8fryyg0"
+  "rev": "af7139857b33b8617539a3bb3d8ac91c91daa3de",
+  "sha256": "0wphsfpswbw5ihqsx456vh406rc8ca0anfkcaz4rxx4lm8prn444"
 }

android/build.gradle.nix

@@ -26,7 +26,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '26.0.1'
+    buildToolsVersion '26.0.2'
 
     sourceSets {
       main {

android/default.nix

@@ -1,9 +1,10 @@
 env@{
   nixpkgs
 , nixpkgsCross
-, ghcAndroidArm64
-, ghcAndroidArmv7a
+, ghcAndroidAarch64
+, ghcAndroidAarch32
 , overrideCabal
+, ...
 }:
 with nixpkgs.lib.strings;
 let impl = import ./impl.nix env;

android/impl.nix

@@ -5,20 +5,17 @@ let overrideAndroidCabal = package: overrideCabal package (drv: {
       '';
     });
     #TODO: Keep the signing key for dev mode more consistent, e.g. in ~/.config/reflex-platform, so that the app can be reinstalled in-place
-    addDeployScript = src: nixpkgs.runCommand "android-app" {
+    addDeployScript = src: hostPkgs.runCommand "android-app" {
       inherit src;
       buildCommand = ''
         mkdir -p "$out/bin"
         cp -r "$src"/* "$out"
         cat >"$out/bin/deploy" <<EOF
-          $(which adb) install -r "$(echo $out/*.apk)"
+          $(command -v adb) install -r "$(echo $out/*.apk)"
         EOF
         chmod +x "$out/bin/deploy"
       '';
-      buildInputs = with nixpkgs; [
-        androidsdk
-        which
-      ];
+      buildInputs = [ hostPkgs.androidenv.androidsdk_8_0 ];
     } "";
     inherit (nixpkgs.lib) splitString escapeShellArg mapAttrs attrNames concatStrings optionalString;
 in {
@@ -40,16 +37,15 @@ in {
     src =
       let splitApplicationId = splitString "." applicationId;
           appSOs = mapAttrs (abiVersion: { myNixpkgs, myHaskellPackages }: {
-            inherit (myNixpkgs) libiconv;
             hsApp = overrideAndroidCabal (package myHaskellPackages);
           }) {
             "arm64-v8a" = {
-              myNixpkgs = nixpkgsCross.android.arm64Impure;
-              myHaskellPackages = ghcAndroidArm64;
+              myNixpkgs = nixpkgsCross.android.aarch64;
+              myHaskellPackages = ghcAndroidAarch64;
             };
             "armeabi-v7a" = {
-              myNixpkgs = nixpkgsCross.android.armv7aImpure;
-              myHaskellPackages = ghcAndroidArmv7a;
+              myNixpkgs = nixpkgsCross.android.aarch32;
+              myHaskellPackages = ghcAndroidAarch32;
             };
           };
           abiVersions = attrNames appSOs;
@@ -73,8 +69,8 @@ in {
         javaSrc = nixpkgs.buildEnv {
           name = applicationId + "-java";
           paths = [
-            (ghcAndroidArm64.android-activity.src + "/java") #TODO: Use output, not src
-            (ghcAndroidArm64.reflex-dom.src + "/java")
+            (ghcAndroidAarch64.android-activity.src + "/java") #TODO: Use output, not src
+            (ghcAndroidAarch64.reflex-dom.src + "/java")
           ];
         };
         src = ./src;
@@ -92,16 +88,12 @@ in {
           ln -s "$applicationMk" "$out/jni/Application.mk"
 
         '' + concatStrings (builtins.map (arch:
-          let inherit (appSOs.${arch}) libiconv hsApp;
+          let inherit (appSOs.${arch}) hsApp;
           in ''
             {
               ARCH_LIB=$out/lib/${arch}
               mkdir -p $ARCH_LIB
 
-              # Move libiconv (per arch) to the correct place
-              cp --no-preserve=mode "${libiconv}/lib/libiconv.so" "$ARCH_LIB"
-              cp --no-preserve=mode "${libiconv}/lib/libcharset.so" "$ARCH_LIB"
-
               local exe="${hsApp}/bin/lib${executableName}.so"
               if [ ! -f "$exe" ] ; then
                 >&2 echo 'Error: executable "${executableName}" not found'

android/patches/force-relocation.patch

@@ -0,0 +1,13 @@
+diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
+index 86dd913461..e6d6defdb9 100644
+--- a/compiler/main/DriverPipeline.hs
++++ b/compiler/main/DriverPipeline.hs
+@@ -830,7 +830,7 @@ llvmOptions dflags =
+         rmodel | gopt Opt_PIC dflags        = "pic"
+                | positionIndependent dflags = "pic"
+                | WayDyn `elem` ways dflags  = "dynamic-no-pic"
+-               | otherwise                  = "static"
++               | otherwise                  = "pic" -- "static"
+
+         align :: Int
+         align = case platformArch (targetPlatform dflags) of