status-im/status-react
2
0
Fork 0
mirror of https://github.com/status-im/status-react.git synced 2025-02-04 07:06:18 +00:00
Code Issues Projects Releases Wiki Activity

nix: Fix generate-maven-and-npm-deps-shell

Browse Source 
Signed-off-by: Pedro Pombeiro <pombeirp@users.noreply.github.com>
This commit is contained in:
Pedro Pombeiro 2019-09-06 13:32:17 +02:00
parent 93b8fa01ed
commit a74089f857
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

2
nix/mobile/android/default.nix
View File

@ -13,7 +13,7 @@ let
# TARGETS
release = callPackage ./targets/release-android.nix { inherit target-os gradle mavenAndNpmDeps mkFilter nodejs jsbundle status-go zlib; androidEnvShellHook = androidEnv.shellHook; };
generate-maven-and-npm-deps-shell = callPackage ./maven-and-npm-deps/maven/shell.nix { inherit gradle maven projectNodePackage status-go; androidEnvShellHook = androidEnv.shellHook; };
generate-maven-and-npm-deps-shell = callPackage ./maven-and-npm-deps/maven/shell.nix { inherit mkShell gradle maven projectNodePackage status-go; androidEnvShellHook = androidEnv.shellHook; };
adb-shell = mkShell {
buildInputs = [ androidEnv.licensedAndroidEnv ];
inherit (androidEnv) shellHook;

4
nix/mobile/android/maven-and-npm-deps/maven/shell.nix
View File

@ -12,9 +12,7 @@ mkShell {
shellHook =
androidEnvShellHook +
status-go.shellHook + ''
rm -rf ./node_modules
cp -a ${projectNodePackage}/node_modules/. ./node_modules/
$STATUS_REACT_HOME/nix/mobile/reset-node_modules.sh "${projectNodePackage}"
chmod -R u+w ./node_modules/
'';
}