summary refs log tree commit diff
path: root/pkgs/servers/shishi
diff options
context:
space:
mode:
authorjanus <janus@xn--kn-1ia.guru>2015-11-28 00:46:00 +0000
committerjanus <janus@xn--kn-1ia.guru>2016-01-01 17:01:13 +0000
commita472d836f674fe388018aaee75983e3400a77db4 (patch)
tree5ee0c10f33ad74f04d5d3785de81fbb04b4e57f2 /pkgs/servers/shishi
parent9897b356612c4bb06a9c9d688da52134dfe8fb95 (diff)
downloadnixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar
nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.gz
nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.bz2
nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.lz
nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.xz
nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.tar.zst
nixpkgs-a472d836f674fe388018aaee75983e3400a77db4.zip
FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep
Diffstat (limited to 'pkgs/servers/shishi')
-rw-r--r--pkgs/servers/shishi/default.nix2
-rw-r--r--pkgs/servers/shishi/freebsd-unistd.patch12
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index a97e6847a45..e26fd6ca749 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   };
 
   # Fixes support for gcrypt 1.6+
-  patches = [ ./gcrypt-fix.patch ];
+  patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ];
 
   buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ];
 
diff --git a/pkgs/servers/shishi/freebsd-unistd.patch b/pkgs/servers/shishi/freebsd-unistd.patch
new file mode 100644
index 00000000000..9399e20205b
--- /dev/null
+++ b/pkgs/servers/shishi/freebsd-unistd.patch
@@ -0,0 +1,12 @@
+diff --git a/gl/unistd.in.h b/gl/unistd.in.h
+index 2ea9af4..ed58960 100644
+--- a/gl/unistd.in.h
++++ b/gl/unistd.in.h
+@@ -116,6 +116,7 @@
+ # include <getopt.h>
+ #endif
+ 
++#include "config.h"
+ _GL_INLINE_HEADER_BEGIN
+ #ifndef _GL_UNISTD_INLINE
+ # define _GL_UNISTD_INLINE _GL_INLINE