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

Also fix neon-0.26 build

Browse Source 
svn path=/nixpkgs/trunk/; revision=21392
This commit is contained in:
Yury G. Kudryashov 2010-04-27 22:05:00 +00:00
parent 293cde6747
commit 415f0fdc9f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/neon/0.26.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
}: }:
@ -14,11 +14,13 @@ stdenv.mkDerivation {
sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj"; sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj";
}; };
buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; buildInputs = [libxml2]
++ stdenv.lib.optional compressionSupport zlib
++ (if sslSupport then [ openssl pkgconfig ] else []);
configureFlags = '' configureFlags = ''
${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

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