From a85c45884ec152ede2aaac3cd2b6d5d7a1a0b66c Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 18 Apr 2020 12:45:00 +0200
Subject: [PATCH] Android is weird (again)

---
 shells/accentor-android.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/shells/accentor-android.nix b/shells/accentor-android.nix
index c926a068..a6dc92cc 100644
--- a/shells/accentor-android.nix
+++ b/shells/accentor-android.nix
@@ -45,7 +45,7 @@ let
         profile = '''
           export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"
         ''';
-        runScript = "''${run}";
+        runScript = "bash -c '''''${run}'''";
       }).env
   '';
 
@@ -53,7 +53,7 @@ let
     #!${pkgs.bash}/bin/bash
 
     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" ''
@@ -102,4 +102,7 @@ pkgs.mkShell {
       }
     )
   ];
+  shellHook = ''
+    export ANDROID_SDK_ROOT="${composed.androidsdk}/libexec/android-sdk/"
+  '';
 }