diff options
| author | Michael Roitzsch <reactorcontrol@icloud.com> | 2020-05-18 17:48:24 +0200 |
|---|---|---|
| committer | Michael Roitzsch <reactorcontrol@icloud.com> | 2020-05-18 17:48:24 +0200 |
| commit | cb38977986f9068fbba0a7e483a8ccbcd45f43ec (patch) | |
| tree | a736ec3bf2dec595ec4f504a69709fd0139e0f68 /pkgs/development/libraries/libmilter | |
| parent | 81fed3c7a2fa3f9e2238f4de6f496dd520cb72bb (diff) | |
libmilter: fix compilation on Darwin
* configure compilation options
* patch sendmail.h header inclusion
Diffstat (limited to 'pkgs/development/libraries/libmilter')
| -rw-r--r-- | pkgs/development/libraries/libmilter/darwin.patch | 28 | ||||
| -rw-r--r-- | pkgs/development/libraries/libmilter/default.nix | 2 |
2 files changed, 29 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libmilter/darwin.patch b/pkgs/development/libraries/libmilter/darwin.patch new file mode 100644 index 000000000000..be46662d6b38 --- /dev/null +++ b/pkgs/development/libraries/libmilter/darwin.patch @@ -0,0 +1,28 @@ +Fix build issues on Darwin. + +--- a/devtools/OS/Darwin 2014-03-05 01:59:45.000000000 +0100 ++++ b/devtools/OS/Darwin 2020-05-18 14:47:57.000000000 +0200 +@@ -8,6 +8,8 @@ + # We look a lot more like 4.4BSD than NeXTStep or OpenStep. + # + define(`confCC', `cc -traditional-cpp -pipe ${Extra_CC_Flags}') ++define(`confCCOPTS_SO', `-fPIC') ++define(`confSOEXT', `dylib') + define(`confMAPDEF', `-DNEWDB -DNIS -DMAP_REGEX -DNETINFO -DAUTO_NETINFO_ALIASES -DAUTO_NETINFO_HOSTS') + define(`confENVDEF', `-DDARWIN') + define(`confLDOPTS', `${Extra_LD_Flags}') +--- a/sendmail/sendmail.h 2020-05-18 14:51:17.000000000 +0200 ++++ b/sendmail/sendmail.h 2020-05-18 14:51:00.000000000 +0200 +@@ -104,7 +104,11 @@ + # endif /* NETX25 */ + + # if NAMED_BIND +-# include <arpa/nameser.h> ++# ifdef __APPLE__ ++# include <arpa/nameser_compat.h> ++# else ++# include <arpa/nameser.h> ++# endif + # ifdef NOERROR + # undef NOERROR /* avoid <sys/streams.h> conflict */ + # endif /* NOERROR */ diff --git a/pkgs/development/libraries/libmilter/default.nix b/pkgs/development/libraries/libmilter/default.nix index 60ced27beac7..f937d818a559 100644 --- a/pkgs/development/libraries/libmilter/default.nix +++ b/pkgs/development/libraries/libmilter/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sh Build -f ./a.m4 ''; - patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ]; + patches = [ ./install.patch ./sharedlib.patch ./glibc-2.30.patch ./darwin.patch ]; nativeBuildInputs = [ m4 ]; |