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

Fix neon build

Browse Source 
Use pkg-config to find openssl

svn path=/nixpkgs/trunk/; revision=21391
This commit is contained in:
Yury G. Kudryashov 2010-04-27 21:54:38 +00:00
parent f892a8efaa
commit 293cde6747
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/neon/0.28.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, libxml2 { stdenv, fetchurl, libxml2, pkgconfig
, compressionSupport ? true, zlib ? null , compressionSupport ? true, zlib ? null
, sslSupport ? true, openssl ? null , sslSupport ? true, openssl ? null
, static ? false , static ? false
@ -17,13 +17,14 @@ stdenv.mkDerivation rec {
sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6"; sha256 = "03ncisn1iziz79vw678wsrv8jf63m2szd2qml5baj53slcd8pvh6";
}; };
buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; buildInputs = [libxml2 pkgconfig openssl]
++ stdenv.lib.optional compressionSupport zlib;
configureFlags = '' configureFlags = ''
${if shared then "--enable-shared" else "--disable-shared"} ${if shared then "--enable-shared" else "--disable-shared"}
${if static then "--enable-static" else "--disable-static"} ${if static then "--enable-static" else "--disable-static"}
${if compressionSupport then "--with-zlib" else "--without-zlib"} ${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 --enable-shared
''; '';

2
pkgs/top-level/all-packages.nix
View File

@ -4723,7 +4723,7 @@ let
}; };
neon028 = import ../development/libraries/neon/0.28.nix { neon028 = import ../development/libraries/neon/0.28.nix {
inherit fetchurl stdenv libxml2 zlib openssl; inherit fetchurl stdenv libxml2 zlib openssl pkgconfig;
compressionSupport = true; compressionSupport = true;
sslSupport = true; sslSupport = true;
}; };