Merge pull request #122759 from dotlambda/mono6

This commit is contained in:
Sandro
2021-05-18 01:25:35 +02:00
committed by GitHub
5 changed files with 15 additions and 16 deletions

View File

@@ -7,14 +7,12 @@
, icu
, stdenv
, openssl
, mono6
, mono
}:
let
# Get as close as possible as the `package.json` required version.
# This is what drives omnisharp.
mono = mono6;
rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json);
rtDepsBinSrcs = builtins.mapAttrs (k: v:
@@ -114,7 +112,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
declare omnisharp_dir="$PWD/${omnisharp.installPath}"
unzip_to "${omnisharp.bin-src}" "$omnisharp_dir"
rm "$omnisharp_dir/bin/mono"
ln -s -T "${mono6}/bin/mono" "$omnisharp_dir/bin/mono"
ln -s -T "${mono}/bin/mono" "$omnisharp_dir/bin/mono"
chmod a+x "$omnisharp_dir/run"
touch "$omnisharp_dir/install.Lock"
@@ -136,6 +134,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
meta = with lib; {
description = "C# for Visual Studio Code (powered by OmniSharp)";
homepage = "https://github.com/OmniSharp/omnisharp-vscode";
license = licenses.mit;
maintainers = [ maintainers.jraygauthier ];
platforms = [ "x86_64-linux" ];