diff options
Diffstat (limited to 'nixpkgs/pkgs/development/compilers/mono')
-rw-r--r-- | nixpkgs/pkgs/development/compilers/mono/4.nix | 1 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/compilers/mono/generic.nix | 8 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/compilers/mono/mono4-glibc.patch | 12 |
3 files changed, 15 insertions, 6 deletions
diff --git a/nixpkgs/pkgs/development/compilers/mono/4.nix b/nixpkgs/pkgs/development/compilers/mono/4.nix index cb6edb2a546d..02c6177c9df0 100644 --- a/nixpkgs/pkgs/development/compilers/mono/4.nix +++ b/nixpkgs/pkgs/development/compilers/mono/4.nix @@ -5,4 +5,5 @@ callPackage ./generic.nix ({ version = "4.8.1.0"; sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65600645 + extraPatches = [ ./mono4-glibc.patch ]; }) diff --git a/nixpkgs/pkgs/development/compilers/mono/generic.nix b/nixpkgs/pkgs/development/compilers/mono/generic.nix index e0cfe247b23a..85d64de6c233 100644 --- a/nixpkgs/pkgs/development/compilers/mono/generic.nix +++ b/nixpkgs/pkgs/development/compilers/mono/generic.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" +, extraPatches ? [] }: let @@ -22,11 +23,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [glib]; - NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ; - - # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723 - dontDisableStatic = true; - configureFlags = [ "--x-includes=${libX11.dev}/include" "--x-libraries=${libX11.out}/lib" @@ -44,7 +40,7 @@ stdenv.mkDerivation rec { # We want pkg-config to take priority over the dlls in the Mono framework and the GAC # because we control pkg-config - patches = [ ./pkgconfig-before-gac.patch ]; + patches = [ ./pkgconfig-before-gac.patch ] ++ extraPatches; # Patch all the necessary scripts. Also, if we're using LLVM, we fix the default # LLVM path to point into the Mono LLVM build, since it's private anyway. diff --git a/nixpkgs/pkgs/development/compilers/mono/mono4-glibc.patch b/nixpkgs/pkgs/development/compilers/mono/mono4-glibc.patch new file mode 100644 index 000000000000..07d5f03f90b8 --- /dev/null +++ b/nixpkgs/pkgs/development/compilers/mono/mono4-glibc.patch @@ -0,0 +1,12 @@ +diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c +index 53c271a4..84bd3252 100644 +--- a/mono/io-layer/processes.c ++++ b/mono/io-layer/processes.c +@@ -19,6 +19,7 @@ + #include <errno.h> + #include <sys/types.h> + #include <sys/stat.h> ++#include <sys/sysmacros.h> + #include <unistd.h> + #ifdef HAVE_SIGNAL_H + #include <signal.h> |