dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

gnutls: fix FreeBSD builds

Browse Source
This commit is contained in:
Ludovic Courtès 2012-08-10 23:28:23 +02:00
parent 986f04c87e
commit aa5220c701
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/libraries/gnutls/default.nix
View File

@ -3,7 +3,7 @@
assert guileBindings -> guile != null; assert guileBindings -> guile != null;
stdenv.mkDerivation rec { stdenv.mkDerivation (rec {
name = "gnutls-3.0.22"; name = "gnutls-3.0.22";
@ -54,3 +54,10 @@ stdenv.mkDerivation rec {
maintainers = [ stdenv.lib.maintainers.ludo ]; maintainers = [ stdenv.lib.maintainers.ludo ];
}; };
} }
//
(stdenv.lib.optionalAttrs stdenv.isFreeBSD {
# FreeBSD doesn't have <alloca.h>, and Gnulib's `alloca' module isn't used.
patches = [ ./guile-gnulib-includes.patch ];
}))

19
pkgs/development/libraries/gnutls/guile-gnulib-includes.patch Normal file
View File

@ -0,0 +1,19 @@
commit 699ae6ef085c699dd5f3fb460b0f8a2408cc2860
Author: Simon Josefsson <simon@josefsson.org>
Date: Thu Aug 9 15:24:11 2012 +0200
Add gnulib -I's to guile-snarf command.
diff --git a/guile/src/Makefile.am b/guile/src/Makefile.am
index 7b55500..f52eee9 100644
--- a/guile/src/Makefile.am
+++ b/guile/src/Makefile.am
@@ -95,7 +95,7 @@ priorities.i.c: $(srcdir)/make-session-priorities.scm
# `$(GUILE_CFLAGS)' may contain a series of `-I' switches so it must be
# included here, even though we'd really want `$(GUILE_CPPFLAGS)'.
snarfcppopts = $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
- $(CFLAGS) $(AM_CFLAGS) $(GUILE_CFLAGS)
+ $(CFLAGS) $(guile_gnutls_v_2_la_CFLAGS)
.c.x: $(BUILT_SOURCES)
$(guile_snarf) -o $@ $< $(snarfcppopts)