upgrade gomobile to version from 2023-11-27

Signed-off-by: Jakub Sokołowski <[email protected]>
status-im · Jan 10, 2024 · df8b955 · df8b955
1 parent ada8eb3
commit df8b955
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/shell.nix b/shell.nix
@@ -10,8 +10,8 @@
       android_sdk.accept_license = true;
     };
     overlays = [
-      (self: super: {
-        androidPkgs = pkgs.androidenv.composeAndroidPackages {
+      (final: prev: {
+        androidPkgs = prev.androidenv.composeAndroidPackages {
           toolsVersion = "26.1.1";
           platformToolsVersion = "33.0.3";
           buildToolsVersions = [ "31.0.0" ];
@@ -24,6 +24,19 @@
             "extras;google;m2repository"
           ];
         };
+        # https://github.com/golang/go/issues/58426
+        gomobile = prev.gomobile.override {
+          buildGoModule = args: prev.buildGo121Module ( args // rec {
+            version = "unstable-2023-11-27";
+            src = prev.fetchgit {
+              rev = "76ac6878050a2eef81867f2c6c21108e59919e8f";
+              name = "gomobile";
+              url = "https://go.googlesource.com/mobile";
+              sha256 = "sha256-mq7gKccvI7VCBEiQTueWxMPOCgg/MGE8y2+BlwWx5pw=";
+            };
+            vendorHash = "sha256-8OBLVd4zs89hoJXzC8BPRgrYjjR7DiA39+7tTaSYUFI=";
+          });
+        };
       })
     ];
   }
@@ -40,18 +53,10 @@ let
     allowHigher = true;
   };
   /* Gomobile also needs the Xcode wrapper. */
-  gomobileMod = (pkgs.gomobile.overrideAttrs (old: {
-    patches = self.fetchurl {
-      url = "https://github.com/golang/mobile/commit/76ac6878050a2eef81867f2c6c21108e59919e8f";
-      sha256 = "sha256-TZ/Yhe8gMRQUZFAs9G5/cf2b9QGtTHRSObBFD5Pbh7Y=";
-    };
-  })).override {
-    /* Gomobile also needs the Xcode wrapper. */
+  gomobileMod = pkgs.gomobile.override {
     inherit xcodeWrapper;
     withAndroidPkgs = !isMacM1;
   };
-
-
 in pkgs.mkShell {
   name = "status-go-shell";