Merge branch 'staging-next' into staging

2021-03-01 19:30:56 +01:00
parent 58aa8e36e2 4b494c403e
commit 913394a1d9
138 changed files with 6595 additions and 4660 deletions
@@ -72,8 +72,8 @@ let
    installPhase = ''
      cp -r . $out
      wrapProgram $out/bin/studio.sh \
+        --set-default JAVA_HOME "$out/jre" \
        --set ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
-        --set JAVA_HOME "$out/jre" \
        --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \
        --set FONTCONFIG_FILE ${fontsConf} \
        --prefix PATH : "${lib.makeBinPath [