From 288b886396efd7ae461477485cd8b014557adb34 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Fri, 2 Sep 2022 09:30:55 +0200 Subject: jetbrains.rider: fix startup Rider 2022.2 changed the way it invokes Rider.Backend, this adds the required patching so that startup succeeds again. --- pkgs/applications/editors/jetbrains/default.nix | 10 +++++++--- 1 file 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 ''); }); -- cgit 1.4.1 From c1ad7b9056598690422dd13e245350dc1702fb74 Mon Sep 17 00:00:00 2001 From: Raphael Robatsch Date: Mon, 5 Sep 2022 00:19:39 +0200 Subject: jetbrains.rider: add raphaelr to maintainers --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/applications/editors/jetbrains/default.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c429c50b9853..e7ae43fc8a6f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10934,6 +10934,13 @@ githubId = 314564; name = "Ryan Lahfa"; }; + raphaelr = { + email = "raphael-git@tapesoftware.net"; + matrix = "@raphi:tapesoftware.net"; + github = "raphaelr"; + githubId = 121178; + name = "Raphael Robatsch"; + }; raquelgb = { email = "raquel.garcia.bautista@gmail.com"; github = "raquelgb"; diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index f8f93a1fec8f..47dabbf0cbb9 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -224,7 +224,7 @@ let apps, services and libraries, Unity games, ASP.NET and ASP.NET Core web applications. ''; - maintainers = [ ]; + maintainers = with maintainers; [ raphaelr ]; }; }).overrideAttrs (attrs: { postPatch = lib.optionalString (!stdenv.isDarwin) (attrs.postPatch + '' -- cgit 1.4.1