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

Merge pull request #12617 from pmahoney/darwin-mono

Browse Source 
Get mono building on darwin
This commit is contained in:
vbgl 2016-01-27 14:27:44 +01:00
commit 5b153a1c2c
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/mono/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert }: { stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc }:
let let
llvm = callPackage ./llvm.nix { }; llvm = callPackage ./llvm.nix { };
@ -14,10 +14,12 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib
]; ]
++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
propagatedBuildInputs = [glib]; propagatedBuildInputs = [glib];
NIX_LDFLAGS = "-lgcc_s" ; NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
# To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
dontDisableStatic = true; dontDisableStatic = true;
@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = http://mono-project.com/; homepage = http://mono-project.com/;
description = "Cross platform, open source .NET development framework"; description = "Cross platform, open source .NET development framework";
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; darwin ++ linux;
maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ]; maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ];
license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ? license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
}; };

5
pkgs/development/libraries/libgdiplus/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, glib, cairo, fontconfig { stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
, libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer , libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer
, libXrender, libexif }: , libXrender, libexif }:
@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ pkgconfig glib cairo fontconfig libtiff giflib libungif [ pkgconfig glib cairo fontconfig libtiff giflib libungif
libjpeg libpng libXrender libexif libjpeg libpng libXrender libexif
]; ]
++ stdenv.lib.optional stdenv.isDarwin Carbon;
} }

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

@ -4390,7 +4390,10 @@ let
mlton = callPackage ../development/compilers/mlton { }; mlton = callPackage ../development/compilers/mlton { };
mono = callPackage ../development/compilers/mono {}; mono = callPackage ../development/compilers/mono {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.frameworks) Foundation;
};
monoDLLFixer = callPackage ../build-support/mono-dll-fixer { }; monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
@ -7292,7 +7295,9 @@ let
libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { }; libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { };
libgdiplus = callPackage ../development/libraries/libgdiplus { }; libgdiplus = callPackage ../development/libraries/libgdiplus {
inherit (darwin.apple_sdk.frameworks) Carbon;
};
libgksu = callPackage ../development/libraries/libgksu { }; libgksu = callPackage ../development/libraries/libgksu { };