From 293cde6747933ce86512ad59d8ba0e73d2e9773e Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 27 Apr 2010 21:54:38 +0000
Subject: [PATCH] Fix neon build

Use pkg-config to find openssl

svn path=/nixpkgs/trunk/; revision=21391
---
 pkgs/development/libraries/neon/0.28.nix | 7 ++++---
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/neon/0.28.nix b/pkgs/development/libraries/neon/0.28.nix
index c41474b39b6..8e717ff52d8 100644
--- a/pkgs/development/libraries/neon/0.28.nix
+++ b/pkgs/development/libraries/neon/0.28.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2
+{ stdenv, fetchurl, libxml2, pkgconfig
 , compressionSupport ? true, zlib ? null
 , sslSupport ? true, openssl ? null
 , static ? false
@@ -17,13 +17,14 @@ stdenv.mkDerivation rec {
     sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6";
   };
 
-  buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib;
+  buildInputs = [libxml2 pkgconfig openssl]
+    ++ stdenv.lib.optional compressionSupport zlib;
 
   configureFlags = ''
     ${if shared then "--enable-shared" else "--disable-shared"}
     ${if static then "--enable-static" else "--disable-static"}
     ${if compressionSupport then "--with-zlib" else "--without-zlib"}
-    ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
+    ${if sslSupport then "--with-ssl" else "--without-ssl"}
     --enable-shared
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 629dc126912..41fadf1fc1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4723,7 +4723,7 @@ let
   };
 
   neon028 = import ../development/libraries/neon/0.28.nix {
-    inherit fetchurl stdenv libxml2 zlib openssl;
+    inherit fetchurl stdenv libxml2 zlib openssl pkgconfig;
     compressionSupport = true;
     sslSupport = true;
   };