From 0e3b22768dd80530401af2757a1bd9e0b6a4612b Mon Sep 17 00:00:00 2001 From: Andrei Lapshin Date: Sat, 28 May 2022 14:15:48 +0300 Subject: [PATCH] Android Studio: allow to pass shell arguments Pass parameters to Android Studio shell script. This way Android Studio can be used as git diff/merge tool. For example ``` [difftool "androidstudio"] cmd = android-studio nosplash diff $LOCAL $REMOTE 2>/dev/null trustExitCode = true [mergetool "androidstudio"] cmd = android-studio nosplash merge $LOCAL $REMOTE $BASE $MERGED 2>/dev/null trustExitCode = true ``` See https://www.jetbrains.com/help/idea/working-with-the-ide-features-from-command-line.html#arguments --- pkgs/applications/editors/android-studio/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 25dffad43bb9..bc74edf5261d 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -196,7 +196,7 @@ in runCommand { startScript = '' #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" ''; preferLocalBuild = true; allowSubstitutes = false;