status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix builds with local status-go override 

Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-12-06 10:53:09 +01:00
parent 21d24e7eef
commit 0cca662380
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -323,7 +323,7 @@ android-devices: ##@other Invoke adb devices
android-logcat: export _NIX_ATTR := targets.mobile.android.adb.shell android-logcat: export _NIX_ATTR := targets.mobile.android.adb.shell
android-logcat: export TARGET_OS ?= android android-logcat: export TARGET_OS ?= android
android-logcat: ##@other Read status-react logs from Android phone using adb 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 _NIX_ATTR := targets.mobile.android.adb.shell
android-install: export TARGET_OS ?= android android-install: export TARGET_OS ?= android

3
nix/status-go/default.nix
View File

@ -22,6 +22,7 @@ let
goPackagePath = "github.com/${owner}/${repo}"; goPackagePath = "github.com/${owner}/${repo}";
rev = "unknown"; rev = "unknown";
shortRev = "unknown"; shortRev = "unknown";
sanitizedVersion = version;
versionName = "develop"; versionName = "develop";
src = src =
let path = traceValFn (path: "Using local ${repo} sources from ${path}\n") config.status_go.src_override; 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 # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
mkFilter { mkFilter {
dirRootsToInclude = []; 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" ]; filesToInclude = [ "Makefile" "go.mod" "go.sum" "VERSION" ];
root = path; root = path;
}; };