debug!: point to store node investigation branch

override gomobile to enable & use cgo
debug:! CGO_ENABLED=1;
2024-04-17 15:40:43 +02:00 · 2024-04-17 15:40:43 +02:00 · 2024-04-17 15:40:43 +02:00 · 2024-04-17 15:40:43 +02:00 · 2024-04-17 15:40:43 +02:00
3 changed files with 28 additions and 22 deletions
@@ -60,26 +60,30 @@ in {
    version = "15.0";
    allowHigher = true;
  };
-  go = super.go_1_19;
+  go = super.go_1_20;
  clang = super.clang_15;
-  buildGoPackage = super.buildGo119Package;
-  buildGoModule = super.buildGo119Module;
-  gomobile = (super.gomobile.overrideAttrs (old: {
-    patches = [
-      (self.fetchurl { # https://github.com/golang/mobile/pull/84
-        url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
-        sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-      })
-      (self.fetchurl { # https://github.com/golang/go/issues/58426
-        url = "https://github.com/golang/mobile/commit/406ed3a7b8e44dc32844953647b49696d8847d51.patch";
-        sha256 = "sha256-dqbYukHkQEw8npOkKykOAzMC3ot/Y4DEuh7fE+ptlr8=";
-      })
-    ];
-  })).override {
-    # FIXME: No Android SDK packages for aarch64-darwin.
-    withAndroidPkgs = stdenv.system != "aarch64-darwin";
-    androidPkgs = self.androidEnvCustom.compose;
-  };
+  buildGoPackage = super.buildGo120Package;
+  buildGoModule = super.buildGo120Module;
+
+  gomobile = super.gomobile.override {
+      # FIXME: No Android SDK packages for aarch64-darwin.
+      withAndroidPkgs = stdenv.system != "aarch64-darwin";
+      androidPkgs = self.androidEnvCustom.compose;
+      buildGoModule = args: super.buildGo120Module ( args // rec {
+        CGO_ENABLED=1;
+        GODEBUG="netdns=cgo";
+        patches = [
+          (self.fetchurl { # https://github.com/golang/mobile/pull/84
+            url = "https://github.com/golang/mobile/commit/f20e966e05b8f7e06bed500fa0da81cf6ebca307.patch";
+            sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
+          })
+          (self.fetchurl { # https://github.com/golang/go/issues/58426
+            url = "https://github.com/golang/mobile/commit/406ed3a7b8e44dc32844953647b49696d8847d51.patch";
+            sha256 = "sha256-dqbYukHkQEw8npOkKykOAzMC3ot/Y4DEuh7fE+ptlr8=";
+          })
+        ];
+      });
+    };

  # Android environement
  androidEnvCustom = callPackage ./pkgs/android-sdk { };
@@ -35,6 +35,8 @@ in buildGoPackage {

  ANDROID_HOME = optionalString isAndroid androidPkgs.sdk;

+  CGO_ENABLED=1;
+
  # Ensure XCode is present for iOS, instead of failing at the end of the build.
  preConfigure = optionalString isIOS enforceXCodeAvailable;

@@ -3,7 +3,7 @@
    "_comment": "Instead use: scripts/update-status-go.sh <rev>",
    "owner": "status-im",
    "repo": "status-go",
-    "version": "v0.179.4",
-    "commit-sha1": "d246699c5e1c19b3f905a6c10c3526d2004de273",
-    "src-sha256": "0gnnx70g8g8yhn29qj58if91fflgl0q2ry0wipzvvpdxd07hpxin"
+    "version": "investigate-store-node-failure",
+    "commit-sha1": "88c0b7d6a1e0ca199c4bc72f320c6087e476d59f",
+    "src-sha256": "1yh65b52nw62mi8mpq3jpd22m29gny4gd71iyk5n06bai32s6q9c"
 }
Author	SHA1	Message	Date
Siddarth Kumar	c4dc896813	debug!: point to store node investigation branch	2024-04-17 15:40:43 +02:00
Siddarth Kumar	e73cd73c1c	override gomobile to enable & use cgo	2024-04-17 15:40:43 +02:00
Siddarth Kumar	adc222a88d	debug:! CGO_ENABLED=1; https://github.com/status-im/status-go/compare/d246699c...5cccd862	2024-04-17 15:40:43 +02:00
Siddarth Kumar	d6ef1eb775	point to status-go with go upgrade https://github.com/status-im/status-go/compare/d246699c...ddff9e07	2024-04-17 15:40:43 +02:00
Siddarth Kumar	966cd511e6	set go to 1.20 in nix overlay	2024-04-17 15:40:43 +02:00