diff options
| author | Marco Maggesi <maggesi@math.unifi.it> | 2012-06-06 21:47:26 +0000 |
|---|---|---|
| committer | Marco Maggesi <maggesi@math.unifi.it> | 2012-06-06 21:47:26 +0000 |
| commit | 4a5f21239f729a0454390d2797d20e667d570e1b (patch) | |
| tree | 87bd56518b190ee4c0986dc5fa0c0c839e6c0474 /pkgs/development/libraries/neon | |
| parent | 93f41f5ad35b0f0d110bb537d178de78d5d13b47 (diff) | |
Fix build of neon on darwin
svn path=/nixpkgs/trunk/; revision=34375
Diffstat (limited to 'pkgs/development/libraries/neon')
| -rw-r--r-- | pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/neon/0.29.nix | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch b/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch new file mode 100644 index 0000000000000..87222a9c0ce09 --- /dev/null +++ b/pkgs/development/libraries/neon/0.29.6-darwin-fix-configure.patch @@ -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 diff --git a/pkgs/development/libraries/neon/0.29.nix b/pkgs/development/libraries/neon/0.29.nix index 8666f6233a932..ffc409d271e04 100644 --- a/pkgs/development/libraries/neon/0.29.nix +++ b/pkgs/development/libraries/neon/0.29.nix @@ -9,6 +9,10 @@ assert compressionSupport -> zlib != null; assert sslSupport -> openssl != null; assert static || shared; +let + inherit (stdenv.lib) optionals; +in + stdenv.mkDerivation rec { name = "neon-0.29.6"; @@ -17,6 +21,8 @@ stdenv.mkDerivation rec { sha256 = "0hzbjqdx1z8zw0vmbknf159wjsxbcq8ii0wgwkqhxj3dimr0nr4w"; }; + patches = optionals stdenv.isDarwin [ ./0.29.6-darwin-fix-configure.patch ]; + buildInputs = [libxml2 pkgconfig openssl] ++ stdenv.lib.optional compressionSupport zlib; |