diff --git a/nix/default.nix b/nix/default.nix index 8e284fbc..dbb04e49 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -3,5 +3,8 @@ config.android_sdk.accept_license = true; } }: -#pkgs.callPackage ./mobile_pkg.nix { } -pkgs.callPackage ./mobile_mod.nix { } +{ + pkg = pkgs.callPackage ./mobile_pkg.nix { }; + mod = pkgs.callPackage ./mobile_mod.nix { }; + bkp = pkgs.callPackage ./mobile_bkp.nix { }; +} diff --git a/nix/mobile_mod.nix b/nix/mobile_mod.nix index 37441a8c..48a106d0 100644 --- a/nix/mobile_mod.nix +++ b/nix/mobile_mod.nix @@ -1,4 +1,4 @@ -{ pkgs, buildGoModule }: +{ pkgs, buildGo119Module }: let androidPkgs = pkgs.androidenv.composeAndroidPackages { @@ -8,13 +8,13 @@ let }; androidSdk = androidPkgs.androidsdk; #gomobile = pkgs.gomobile.override { inherit androidPkgs; }; -in buildGoModule { +in buildGo119Module { pname = "go-waku"; version = "devel"; goPkgPath = "github.com/status-im/go-waku"; - vendorSha256 = "sha256-+W5PnVmD4oPh3a8Ik9Xn3inCI8shqEsdlkG/d6PQntk="; + vendorSha256 = "sha256-tNBIxJv9Vty83UQ31XWzXicRVcEAIs30eyA3RBQz9nw="; doCheck = false; - proxyVendor = true; + #proxyVendor = true; src = ./..; @@ -22,6 +22,7 @@ in buildGoModule { ANDROID_HOME = "${androidSdk}/libexec/android-sdk"; #GOFLAGS = "-mod=mod"; + #GO111MODULE = "on"; #overrideModAttrs = (_: { # postBuild = '' @@ -34,19 +35,37 @@ in buildGoModule { # Correct GOPATH necessary to avoid error: # `no exported names in the package "_/build/go-waku/mobile"` postConfigure = '' + echo "$GOPATH" cd "$NIX_BUILD_TOP" mkdir -p "go/src/$(dirname "$goPkgPath")" mv "$sourceRoot" "go/src/$goPkgPath" - cd go/src/$goPkgPath/mobile + cd go/src/$goPkgPath ''; + preBuild = '' + echo '-----------------------------------------------' + find -L vendor | grep go-ethereum + echo '-----------------------------------------------' + find -L vendor | grep prometheus + echo '-----------------------------------------------' + ls -l vendor/contrib.go.opencensus.io/exporter/prometheus + echo '-----------------------------------------------' + ls -l vendor/contrib.go.opencensus.io/exporter/prometheus/@v + echo '-----------------------------------------------' + ls -l vendor/contrib.go.opencensus.io/exporter/prometheus/@v/list + echo '-----------------------------------------------' + ''; buildPhase = '' - GO111MODULE=off gomobile bind -x \ + runHook preBuild + + gomobile bind -x -v \ -target=android/arm64 \ -androidapi=23 \ -ldflags="-s -w" \ -o go-waku.aar \ ./mobile + + runHook postBuild ''; installPhase = '' diff --git a/nix/mobile_pkg.nix b/nix/mobile_pkg.nix index aeeb6bdd..72a313b4 100644 --- a/nix/mobile_pkg.nix +++ b/nix/mobile_pkg.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, callPackage, buildGoModule, buildGoPackage }: +{ lib, pkgs, callPackage, buildGo119Package }: let androidPkgs = pkgs.androidenv.composeAndroidPackages { @@ -8,7 +8,7 @@ let }; androidSdk = androidPkgs.androidsdk; gomobile = pkgs.gomobile.override { inherit androidPkgs; }; -in buildGoPackage rec { +in buildGo119Package rec { pname = "go-waku"; version = "devel"; goPackagePath = "github.com/status-im/go-waku";