about summary refs log tree commit diff
path: root/pkgs/applications/editors
diff options
context:
space:
mode:
authorRaphael Robatsch <raphael-git@tapesoftware.net>2022-09-02 09:30:55 +0200
committerRaphael Robatsch <raphael-git@tapesoftware.net>2022-09-09 08:39:10 +0200
commit288b886396efd7ae461477485cd8b014557adb34 (patch)
tree53a5bec8594eb56bde188c539287865d13d626fe /pkgs/applications/editors
parent8b9f879fced5b26267b9cf77e608e44ff54d5a96 (diff)
downloadnixlib-288b886396efd7ae461477485cd8b014557adb34.tar
nixlib-288b886396efd7ae461477485cd8b014557adb34.tar.gz
nixlib-288b886396efd7ae461477485cd8b014557adb34.tar.bz2
nixlib-288b886396efd7ae461477485cd8b014557adb34.tar.lz
nixlib-288b886396efd7ae461477485cd8b014557adb34.tar.xz
nixlib-288b886396efd7ae461477485cd8b014557adb34.tar.zst
nixlib-288b886396efd7ae461477485cd8b014557adb34.zip
jetbrains.rider: fix startup
Rider 2022.2 changed the way it invokes Rider.Backend, this adds the
required patching so that startup succeeds again.
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r--pkgs/applications/editors/jetbrains/default.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix
index 3ec39fa071fd..f8f93a1fec8f 100644
--- a/pkgs/applications/editors/jetbrains/default.nix
+++ b/pkgs/applications/editors/jetbrains/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, callPackage, fetchurl
-, jdk, cmake, gdb, zlib, python3
+, jdk, cmake, gdb, zlib, python3, icu
 , lldb
 , dotnet-sdk_6
 , maven
@@ -211,6 +211,8 @@ let
     (mkJetBrainsProduct {
       inherit pname version src wmClass jdk;
       product = "Rider";
+      # icu is required by Rider.Backend
+      extraLdPath = [ icu ];
       meta = with lib; {
         homepage = "https://www.jetbrains.com/rider/";
         inherit description license platforms;
@@ -226,9 +228,11 @@ let
       };
     }).overrideAttrs (attrs: {
       postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + ''
+        interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
+        patchelf --set-interpreter $interp lib/ReSharperHost/linux-x64/Rider.Backend
+
         rm -rf lib/ReSharperHost/linux-x64/dotnet
-        mkdir -p lib/ReSharperHost/linux-x64/dotnet/
-        ln -s ${dotnet-sdk_6}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet
+        ln -s ${dotnet-sdk_6} lib/ReSharperHost/linux-x64/dotnet
       '');
     });