From 3343c0e4c3ab6fa7732b9c89486c65a776d7f005 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 22 Jul 2021 11:01:18 +0200 Subject: [PATCH] gomobile: 2020-06-22 -> 2021-06-14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This upgrade together with Go 1.16 drops support for iOS ARM32 builds. The need for applying a patch was also removed by this fix: https://go.googlesource.com/mobile/+/7c8f154d100840bc5828285bb390bbae1cb5a98c Signed-off-by: Jakub SokoĊ‚owski --- pkgs/development/mobile/gomobile/default.nix | 17 +++++++---------- .../gomobile/resolve-nix-android-sdk.patch | 15 --------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch diff --git a/pkgs/development/mobile/gomobile/default.nix b/pkgs/development/mobile/gomobile/default.nix index 17b4e2fb3f6..ce44b7dd934 100644 --- a/pkgs/development/mobile/gomobile/default.nix +++ b/pkgs/development/mobile/gomobile/default.nix @@ -3,21 +3,20 @@ , xcodeWrapper ? xcodeenv.composeXcodeWrapper xcodeWrapperArgs , androidPkgs ? androidenv.composeAndroidPackages { includeNDK = true; - ndkVersion = "21.3.6528147"; # WARNING: 22.0.7026061 is broken. + ndkVersion = "22.1.7171670"; } }: buildGoModule { pname = "gomobile"; - version = "unstable-2020-06-22"; + version = "unstable-2021-06-14"; - vendorSha256 = "1n1338vqkc1n8cy94501n7jn3qbr28q9d9zxnq2b4rxsqjfc9l94"; + vendorSha256 = "1irgkgv72rakg7snk1bnp10ibr64ykz9l40s59l4fnl63zsh12a0"; src = fetchgit { - # WARNING: Next commit removes support for ARM 32 bit builds for iOS - rev = "33b80540585f2b31e503da24d6b2a02de3c53ff5"; + rev = "7c8f154d100840bc5828285bb390bbae1cb5a98c"; name = "gomobile"; url = "https://go.googlesource.com/mobile"; - sha256 = "0c9map2vrv34wmaycsv71k4day3b0z5p16yzxmlp8amvqb38zwlm"; + sha256 = "1w9mra1mqf60iafp0ywvja5196fjsjyfhvz4yizqq4qkyll5qmj1"; }; subPackages = [ "bind" "cmd/gobind" "cmd/gomobile" ]; @@ -25,8 +24,6 @@ buildGoModule { # Fails with: go: cannot find GOROOT directory doCheck = false; - patches = [ ./resolve-nix-android-sdk.patch ]; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isDarwin [ xcodeWrapper ]; @@ -48,8 +45,8 @@ buildGoModule { wrapProgram $out/bin/gomobile \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ zlib ]}" \ --prefix PATH : "${androidPkgs.androidsdk}/bin" \ - --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" \ - --set GOPATH $out + --set ANDROID_NDK_HOME "${androidPkgs.androidsdk}/libexec/android-sdk/ndk-bundle" \ + --set ANDROID_HOME "${androidPkgs.androidsdk}/libexec/android-sdk" ''; meta = with lib; { diff --git a/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch b/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch deleted file mode 100644 index cc143e3a447..00000000000 --- a/pkgs/development/mobile/gomobile/resolve-nix-android-sdk.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/cmd/gomobile/bind_androidapp.go b/cmd/gomobile/bind_androidapp.go -index 3b01adc..76216fa 100644 ---- a/cmd/gomobile/bind_androidapp.go -+++ b/cmd/gomobile/bind_androidapp.go -@@ -372,6 +372,10 @@ func androidAPIPath() (string, error) { - var apiVer int - for _, fi := range fis { - name := fi.Name() -+ // Resolve symlinked directories (this is how the Nix Android SDK package is built) -+ if fi2, err := os.Stat(filepath.Join(sdkDir.Name(), name)); err == nil { -+ fi = fi2 -+ } - if !fi.IsDir() || !strings.HasPrefix(name, "android-") { - continue - } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c5ae15d23e..42dcdb65703 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1743,7 +1743,7 @@ in xcodeenv = callPackage ../development/mobile/xcodeenv { }; gomobile = callPackage ../development/mobile/gomobile { - buildGoModule = buildGo115Module; + buildGoModule = buildGo116Module; }; ssh-agents = callPackage ../tools/networking/ssh-agents { };