Unverified Commit 97195c0c authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #286126 from sofuture/jz/update-jetbrains 

jetbrains:* update versions
parents 30c055c3 7d3590b4

pkgs/applications/editors/jetbrains/bin/linux.nix

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ with stdenv; lib.makeOverridable mkDerivation (rec { 
    ln -s ${jdk.home} jbr



    if [ -d "plugins/remote-dev-server" ]; then

      patch -p1 < ${../patches/jetbrains-remote-dev.patch}

      patch -F3 -p1 < ${../patches/jetbrains-remote-dev.patch}

    fi



    vmopts_file=bin/linux/${vmoptsName}

pkgs/applications/editors/jetbrains/bin/versions.json

+220 −220

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/jetbrains/patches/jetbrains-remote-dev.patch

+3 −3
Original line number Diff line number Diff line 
--- a/plugins/remote-dev-server/bin/launcher.sh

+++ b/plugins/remote-dev-server/bin/launcher.sh

@@ -327,6 +327,8 @@

@@ -366,6 +366,8 @@

   REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS=1

 fi
@@ -9,7 +9,7 @@ 
 if [ $REMOTE_DEV_SERVER_USE_SELF_CONTAINED_LIBS -eq 1 ]; then

   SELFCONTAINED_LIBS="$REMOTE_DEV_SERVER_DIR/selfcontained/lib"

   if [ ! -d "$SELFCONTAINED_LIBS" ]; then

@@ -568,3 +570,5 @@

@@ -596,3 +598,5 @@

     "$LAUNCHER" "$STARTER_COMMAND" "$PROJECT_PATH" "$@"

     ;;

 esac

pkgs/applications/editors/jetbrains/plugins/plugins.json

+153 −149

File changed.

Preview size limit exceeded, changes collapsed.