From 76d615532baa725d91387cfabb3bd423b6e09bec Mon Sep 17 00:00:00 2001 From: David McFarland Date: Thu, 25 Mar 2021 14:21:59 -0300 Subject: [PATCH] msbuild: use roslyn from package --- pkgs/development/tools/build-managers/msbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/msbuild/default.nix b/pkgs/development/tools/build-managers/msbuild/default.nix index da4d34f771a0..fe6a0d4dcaca 100644 --- a/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/pkgs/development/tools/build-managers/msbuild/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk, writeText }: +{ lib, stdenv, fetchurl, fetchpatch, makeWrapper, glibcLocales, mono, dotnetPackages, unzip, dotnet-sdk, writeText, roslyn }: let @@ -95,7 +95,7 @@ stdenv.mkDerivation rec { installPhase = '' stage1/mono-msbuild/msbuild mono/build/install.proj /p:MonoInstallPrefix="$out" /p:Configuration=Release-MONO - ln -s ${mono}/lib/mono/msbuild/Current/bin/Roslyn $out/lib/mono/msbuild/Current/bin/Roslyn + ln -s ${roslyn}/lib/dotnet/microsoft.net.compilers.toolset/*/tasks/net472 $out/lib/mono/msbuild/Current/bin/Roslyn makeWrapper ${mono}/bin/mono $out/bin/msbuild \ --set-default MONO_GC_PARAMS "nursery-size=64m" \