MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #122759 from dotlambda/mono6

Browse source
This commit is contained in:
Sandro 2021-05-18 01:25:35 +02:00 committed by GitHub
commit f85bc843c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/applications/science/robotics/mission-planner/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono6 }:
{ lib, stdenv, fetchurl, makeDesktopItem, makeWrapper, unzip, mono }:
let
pname = "mission-planner";
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x";
};
nativeBuildInputs = [ makeWrapper mono6 unzip ];
nativeBuildInputs = [ makeWrapper mono unzip ];
sourceRoot = ".";
AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ];
@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png
cp -r ${desktopItem}/share/applications $out/share/
mv * $out/opt/mission-planner
makeWrapper ${mono6}/bin/mono $out/bin/mission-planner \
makeWrapper ${mono}/bin/mono $out/bin/mission-planner \
--add-flags $out/opt/mission-planner/MissionPlanner.exe
runHook postInstall
'';

4
pkgs/development/tools/omnisharp-roslyn/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv
, fetchurl
, mono6
, mono
, msbuild
, dotnet-sdk
, makeWrapper
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
chmod -R u+w $out/src
mv $out/src/.msbuild/Current/{bin,Bin}
makeWrapper ${mono6}/bin/mono $out/bin/omnisharp \
makeWrapper ${mono}/bin/mono $out/bin/omnisharp \
--add-flags "$out/src/OmniSharp.exe"
'';

7
pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix
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" ];

6
pkgs/tools/graphics/snapdragon-profiler/default.nix
View file

@ -4,7 +4,7 @@
, makeDesktopItem
, copyDesktopItems
, icoutils
, mono6
, mono
, jre
, androidenv
, gtk-sharp-2_0
@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
];
buildInputs = [
mono6
mono
gtk-sharp-2_0
gtk2
libcxx
@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
mv *.so $out/lib
cp -r * $out/lib/snapdragon-profiler
makeWrapper "${mono6}/bin/mono" $out/bin/snapdragon-profiler \
makeWrapper "${mono}/bin/mono" $out/bin/snapdragon-profiler \
--add-flags "$out/lib/snapdragon-profiler/SnapdragonProfiler.exe" \
--suffix PATH : ${lib.makeBinPath [ jre androidenv.androidPkgs_9_0.platform-tools coreutils ]} \
--prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \

8
pkgs/top-level/all-packages.nix
View file

@ -10866,7 +10866,7 @@ in
fsharp = callPackage ../development/compilers/fsharp { };
fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; };
fsharp41 = callPackage ../development/compilers/fsharp41 { };
fstar = callPackage ../development/compilers/fstar {
ocamlPackages = ocaml-ng.ocamlPackages_4_07;
@ -11327,7 +11327,7 @@ in
mlton = mlton20180207;
mono = mono5;
mono = mono6;
mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix {
inherit (darwin) libobjc;
@ -11346,9 +11346,9 @@ in
monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
roslyn = callPackage ../development/compilers/roslyn { mono = mono6; };
roslyn = callPackage ../development/compilers/roslyn { };
msbuild = callPackage ../development/tools/build-managers/msbuild { mono = mono6; };
msbuild = callPackage ../development/tools/build-managers/msbuild { };
mosml = callPackage ../development/compilers/mosml { };