Merge pull request #189412 from raphaelr/jetbrains-rider-startup
jetbrains.rider: fix startup
This commit is contained in:
commit
2c286b47f5
2 changed files with 15 additions and 4 deletions
|
@ -10971,6 +10971,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";
|
||||
|
|
|
@ -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
|
||||
'');
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue