public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mono: 5 -> 6

This commit is contained in:
Robert Schütz 2021-05-12 21:32:40 +02:00
parent 8a0c5da648
commit d099e7558e
5 changed files with 14 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 let
pname = "mission-planner"; pname = "mission-planner";
@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x"; sha256 = "1cgpmsmmnbzw1lwsdafp8yklk1rwc61yf12vc1ahcc6bl7q2385x";
}; };
nativeBuildInputs = [ makeWrapper mono6 unzip ]; nativeBuildInputs = [ makeWrapper mono unzip ];
sourceRoot = "."; sourceRoot = ".";
AOT_FILES = [ "MissionPlanner.exe" "MissionPlanner.*.dll" ]; 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 install -m 444 -D mpdesktop150.png $out/share/icons/mission-planner.png
cp -r ${desktopItem}/share/applications $out/share/ cp -r ${desktopItem}/share/applications $out/share/
mv * $out/opt/mission-planner 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 --add-flags $out/opt/mission-planner/MissionPlanner.exe
runHook postInstall runHook postInstall
''; '';

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

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

6
pkgs/misc/vscode-extensions/ms-dotnettools-csharp/default.nix
View File

@ -7,14 +7,12 @@
, icu , icu
, stdenv , stdenv
, openssl , openssl
, mono6 , mono
}: }:
let let
# Get as close as possible as the `package.json` required version. # Get as close as possible as the `package.json` required version.
# This is what drives omnisharp. # This is what drives omnisharp.
mono = mono6;
rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json); rtDepsSrcsFromJson = builtins.fromJSON (builtins.readFile ./rt-deps-bin-srcs.json);
rtDepsBinSrcs = builtins.mapAttrs (k: v: rtDepsBinSrcs = builtins.mapAttrs (k: v:
@ -114,7 +112,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
declare omnisharp_dir="$PWD/${omnisharp.installPath}" declare omnisharp_dir="$PWD/${omnisharp.installPath}"
unzip_to "${omnisharp.bin-src}" "$omnisharp_dir" unzip_to "${omnisharp.bin-src}" "$omnisharp_dir"
rm "$omnisharp_dir/bin/mono" 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" chmod a+x "$omnisharp_dir/run"
touch "$omnisharp_dir/install.Lock" touch "$omnisharp_dir/install.Lock"

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

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

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

@ -10820,7 +10820,7 @@ in
fsharp = callPackage ../development/compilers/fsharp { }; fsharp = callPackage ../development/compilers/fsharp { };
fsharp41 = callPackage ../development/compilers/fsharp41 { mono = mono6; }; fsharp41 = callPackage ../development/compilers/fsharp41 { };
fstar = callPackage ../development/compilers/fstar { fstar = callPackage ../development/compilers/fstar {
ocamlPackages = ocaml-ng.ocamlPackages_4_07; ocamlPackages = ocaml-ng.ocamlPackages_4_07;
@ -11273,7 +11273,7 @@ in
mlton = mlton20180207; mlton = mlton20180207;
mono = mono5; mono = mono6;
mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix { mono4 = lowPrio (callPackage ../development/compilers/mono/4.nix {
inherit (darwin) libobjc; inherit (darwin) libobjc;
@ -11292,9 +11292,9 @@ in
monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; 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 { }; mosml = callPackage ../development/compilers/mosml { };