diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
| commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
| tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/servers/shishi | |
| parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
| parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) | |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/servers/shishi')
| -rw-r--r-- | pkgs/servers/shishi/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/shishi/freebsd-unistd.patch | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 44db5895290b1..85dfa805fc14d 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 ]; nativeBuildInputs = [ pkgconfig ]; 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 0000000000000..9399e20205b9f --- /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 |