diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-09-12 11:04:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 11:04:10 -0400 |
| commit | 2c286b47f53378bab0c6c18db8762391e971adfc (patch) | |
| tree | f76d4a773ba5c699c1d6f611c4459cf11aa945eb /pkgs/applications/editors | |
| parent | 905220fc6de7db6f784b1f4e4e6fc16d8066423f (diff) | |
| parent | c1ad7b9056598690422dd13e245350dc1702fb74 (diff) | |
| download | nixlib-2c286b47f53378bab0c6c18db8762391e971adfc.tar nixlib-2c286b47f53378bab0c6c18db8762391e971adfc.tar.gz nixlib-2c286b47f53378bab0c6c18db8762391e971adfc.tar.bz2 nixlib-2c286b47f53378bab0c6c18db8762391e971adfc.tar.lz nixlib-2c286b47f53378bab0c6c18db8762391e971adfc.tar.xz nixlib-2c286b47f53378bab0c6c18db8762391e971adfc.tar.zst nixlib-2c286b47f53378bab0c6c18db8762391e971adfc.zip | |
Merge pull request #189412 from raphaelr/jetbrains-rider-startup
jetbrains.rider: fix startup
Diffstat (limited to 'pkgs/applications/editors')
| -rw-r--r-- | pkgs/applications/editors/jetbrains/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 3ec39fa071fd..47dabbf0cbb9 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; @@ -222,13 +224,15 @@ 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 + '' + 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 ''); }); |