about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorDamien Cassou <damien@cassou.me>2020-08-21 12:40:20 +0200
committerGitHub <noreply@github.com>2020-08-21 12:40:20 +0200
commit5939922325286f5e94290a1d9d04f3aa5337eefd (patch)
tree437683f25ae675a5bdec97f10eb714a01d88894e /pkgs/applications/editors
parentae18f738a2a697cf0625a1324d70914cd1e60293 (diff)
parent36b0dfe4a67e693ddcae4582416a21cc69999e04 (diff)
Merge pull request #95789 from jonringer/rider-2020.2
jetbrains.rider: 2020.1.4 -> 2020.2
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/jetbrains/default.nix7
1 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 10569afec945b..fa382cc88362d 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -220,9 +220,6 @@ let
       };
     }) (attrs: {
       patchPhase = lib.optionalString (!stdenv.isDarwin) (attrs.patchPhase + ''
-        # Patch built-in mono for ReSharperHost to start successfully
-        interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
-        patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen
         rm -rf lib/ReSharperHost/linux-x64/dotnet
         mkdir -p lib/ReSharperHost/linux-x64/dotnet/
         ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
@@ -388,12 +385,12 @@ in
 
   rider = buildRider rec {
     name = "rider-${version}";
-    version = "2020.1.4"; /* updated by script */
+    version = "2020.2"; /* updated by script */
     description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz";
-      sha256 = "0vicgwgsbllfw6fz4l82x4vbka3agf541576ix9akyvsskwbaxj9"; /* updated by script */
+      sha256 = "0fxgdxsrrl659lh45slikgck6jld90rd6nnj8gj3aixq0yp5pkix"; /* updated by script */
     };
     wmClass = "jetbrains-rider";
     update-channel = "Rider RELEASE";