chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Android is weird (again)

Browse source
This commit is contained in:
Charlotte Van Petegem 2020-04-18 12:45:00 +02:00
parent f4ff18790d
commit a85c45884e
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shells/accentor-android.nix
View file

@ -45,7 +45,7 @@ let
profile = ''' profile = '''
export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/" export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"
'''; ''';
runScript = "''${run}"; runScript = "bash -c '''''${run}'''";
}).env }).env
''; '';
@ -53,7 +53,7 @@ let
#!${pkgs.bash}/bin/bash #!${pkgs.bash}/bin/bash
REPO_ROOT="$(git rev-parse --show-toplevel)" REPO_ROOT="$(git rev-parse --show-toplevel)"
nix-shell --argstr run "$REPO_ROOT/gradlew $@" "${gradle-fhs-nix}" nix-shell --argstr run "\"$REPO_ROOT/gradlew $@\"" "${gradle-fhs-nix}"
''; '';
sign-release = pkgs.writeScriptBin "sign-release" '' sign-release = pkgs.writeScriptBin "sign-release" ''
@ -102,4 +102,7 @@ pkgs.mkShell {
} }
) )
]; ];
shellHook = ''
export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"
'';
} }