public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build of neon on darwin

Browse Source 
svn path=/nixpkgs/trunk/; revision=34375
This commit is contained in:
Marco Maggesi 2012-06-06 21:47:26 +00:00
parent 93f41f5ad3
commit 4a5f21239f
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch Normal file
View File

@ -0,0 +1,12 @@
diff -Nuar neon-0.29.6/configure neon-0.29.6-darwin-fix-configure/configure
--- neon-0.29.6/configure 2011-05-03 14:25:31.000000000 +0200
+++ neon-0.29.6-darwin-fix-configure/configure 2012-06-06 23:32:21.000000000 +0200
@@ -4184,7 +4184,7 @@
$as_echo "$ne_cv_os_uname" >&6; }
if test "$ne_cv_os_uname" = "Darwin"; then
- CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
+ CPPFLAGS="$CPPFLAGS"
LDFLAGS="$LDFLAGS -flat_namespace"
# poll has various issues in various Darwin releases
if test x${ac_cv_func_poll+set} != xset; then

6
pkgs/development/libraries/neon/0.29.nix
View File

@ -9,6 +9,10 @@ assert compressionSupport -> zlib != null;
assert sslSupport -> openssl != null; assert sslSupport -> openssl != null;
assert static || shared; assert static || shared;
let
inherit (stdenv.lib) optionals;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "neon-0.29.6"; name = "neon-0.29.6";
@ -17,6 +21,8 @@ stdenv.mkDerivation rec {
sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w";
}; };
patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ];
buildInputs = [libxml2 pkgconfig openssl] buildInputs = [libxml2 pkgconfig openssl]
++ stdenv.lib.optional compressionSupport zlib; ++ stdenv.lib.optional compressionSupport zlib;