From 4f5830cf9e2bc9eaae38a9adf9e515ecaa4b29cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Jan 2020 12:15:03 +0100 Subject: [PATCH] mono4: fix build w/glibc-2.30 --- pkgs/development/compilers/mono/4.nix | 1 + pkgs/development/compilers/mono/generic.nix | 3 ++- pkgs/development/compilers/mono/mono4-glibc.patch | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/compilers/mono/mono4-glibc.patch diff --git a/pkgs/development/compilers/mono/4.nix b/pkgs/development/compilers/mono/4.nix index cb6edb2a546..02c6177c9df 100644 --- a/pkgs/development/compilers/mono/4.nix +++ b/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/pkgs/development/compilers/mono/generic.nix b/pkgs/development/compilers/mono/generic.nix index e40d07772dd..61d298543d0 100644 --- a/pkgs/development/compilers/mono/generic.nix +++ b/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 @@ -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. diff --git a/pkgs/development/compilers/mono/mono4-glibc.patch b/pkgs/development/compilers/mono/mono4-glibc.patch new file mode 100644 index 00000000000..07d5f03f90b --- /dev/null +++ b/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 + #include + #include ++#include + #include + #ifdef HAVE_SIGNAL_H + #include