Commit 73705054 authored by FliegendeWurst's avatar FliegendeWurst
Browse files

android-studio: use binary to launch IDE

parent f02405ae

pkgs/applications/editors/android-studio/common.nix

+3 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ let 


    installPhase = ''

      cp -r . $out

      wrapProgram $out/bin/studio.sh \

      wrapProgram $out/bin/studio \

        --set-default JAVA_HOME "$out/jbr" \

        --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \

        --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
@@ -204,6 +204,7 @@ let 
        ]

      }"

    '';

    meta.mainProgram = "studio";

  };



  desktopItem = makeDesktopItem {
@@ -279,7 +280,7 @@ let 
                unset ANDROID_HOME

              fi

            ''}

            exec ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@"

            exec ${fhsEnv}/bin/${drvName}-fhs-env ${lib.getExe androidStudio} "$@"

          '';

        preferLocalBuild = true;

        allowSubstitutes = false;