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

nix: Use a more standard name the patched Gradle and NPM package

This commit is contained in:
Pedro Pombeiro 2019-09-13 14:32:28 +02:00
parent 8c7323e126
commit 061939189b
No known key found for this signature in database
GPG Key ID: C4A24185B2AA48A1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nix/clean.sh
View File

@ -75,9 +75,7 @@ if [[ -n "${nixResultPath}" ]]; then
toDelete=$(findByResult "${nixResultPath}")
else
# use regular expression that should match all status-react build artifacts
toDelete=$(findByRegex '.*-status-react-(shell|source|build).*')
# add Android Gradle and NPM derivations
toDelete+=$(findByRegex 'android-gradle-and-npm-modules(\.drv)?$')
toDelete=$(findByRegex '.*-status-react-(shell|source|build|patched-npm-gradle-modules).*')
fi
# remove duplicates and return

2
nix/mobile/android/maven-and-npm-deps/default.nix
View File

@ -28,7 +28,7 @@ let
reactNativeDepsDir = "$NIX_BUILD_TOP/deps"; # Use local writable deps, otherwise (probably due to some interaction between Nix sandboxing and Java) gradle will fail copying directly from the nix store
in
stdenv.mkDerivation {
name = "patched-android-gradle-and-npm-modules";
name = "status-react-patched-npm-gradle-modules";
src =
let path = ./../../../..; # Import the root /android and /mobile/js_files folders clean of any build artifacts
in builtins.path { # We use builtins.path so that we can name the resulting derivation, otherwise the name would be taken from the checkout directory, which is outside of our control