From 0cca662380a5e77d6a06ed088ea36c29e387bdcc Mon Sep 17 00:00:00 2001
From: Pedro Pombeiro <pombeirp@users.noreply.github.com>
Date: Fri, 6 Dec 2019 10:53:09 +0100
Subject: [PATCH] Fix builds with local status-go override

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
---
 Makefile                                 |  2 +-
 nix/status-go/build-mobile-status-go.nix | 12 ++++++------
 nix/status-go/default.nix                |  3 ++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index d09e151bca..965ed0a5e3 100644
--- a/Makefile
+++ b/Makefile
@@ -323,7 +323,7 @@ android-devices: ##@other Invoke adb devices
 android-logcat: export _NIX_ATTR := targets.mobile.android.adb.shell
 android-logcat: export TARGET_OS ?= android
 android-logcat: ##@other Read status-react logs from Android phone using adb
-	adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs
+	adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG   :' -e 'Go      :' -e 'GoLog   :' -e 'libc    :'
 
 android-install: export _NIX_ATTR := targets.mobile.android.adb.shell
 android-install: export TARGET_OS ?= android
diff --git a/nix/status-go/build-mobile-status-go.nix b/nix/status-go/build-mobile-status-go.nix
index d10e4e503b..b3aef0ed94 100644
--- a/nix/status-go/build-mobile-status-go.nix
+++ b/nix/status-go/build-mobile-status-go.nix
@@ -37,12 +37,12 @@ let
       export NIX_GOWORKDIR=${NIX_GOWORKDIR}
       export ${concatStringsSep " " envVars}
       gomobile bind \
-          -target=${name} \
-          -ldflags='${CGO_LDFLAGS}' \
-          ${concatStringsSep " " gomobileExtraFlags} \
-          ${goBuildFlags} \
-          -o ${outputFileName} \
-          ${goPackagePath}/mobile
+        -target=${name} \
+        -ldflags='${CGO_LDFLAGS}' \
+        ${concatStringsSep " " gomobileExtraFlags} \
+        ${goBuildFlags} \
+        -o ${outputFileName} \
+        ${goPackagePath}/mobile
 
       rm -rf ${NIX_GOWORKDIR}
     '';
diff --git a/nix/status-go/default.nix b/nix/status-go/default.nix
index 538fdc0ff1..972332fe38 100644
--- a/nix/status-go/default.nix
+++ b/nix/status-go/default.nix
@@ -22,6 +22,7 @@ let
         goPackagePath = "github.com/${owner}/${repo}";
         rev = "unknown";
         shortRev = "unknown";
+        sanitizedVersion = version;
         versionName = "develop";
         src =
           let path = traceValFn (path: "Using local ${repo} sources from ${path}\n") config.status_go.src_override;
@@ -32,7 +33,7 @@ let
               # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
               mkFilter {
                 dirRootsToInclude = [];
-                dirsToExclude = [ ".git" ".svn" "CVS" ".hg" ".vscode" ".dependabot" ".github" ".ethereumtest" "build" "eth-node" "protocol" ];
+                dirsToExclude = [ ".git" ".svn" "CVS" ".hg" ".vscode" ".dependabot" ".github" ".ethereumtest" "build" ];
                 filesToInclude = [ "Makefile" "go.mod" "go.sum" "VERSION" ];
                 root = path;
               };