mono4: fix build w/glibc-2.30

This commit is contained in:
Maximilian Bosch 2020-01-25 12:15:03 +01:00
parent eddfcc32b4
commit 4f5830cf9e
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
3 changed files with 15 additions and 1 deletions

View file

@ -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 ];
})

View file

@ -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
@ -42,7 +43,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.

View file

@ -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>