diff options
| author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-27 22:05:00 +0000 |
|---|---|---|
| committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2010-04-27 22:05:00 +0000 |
| commit | 415f0fdc9f9bb73294fc0223a4246879f55fac8f (patch) | |
| tree | c185bdf66ce3835aad5632c15b6c7186598584e2 /pkgs/development/libraries/neon | |
| parent | 293cde6747933ce86512ad59d8ba0e73d2e9773e (diff) | |
| download | nixpkgs-415f0fdc9f9bb73294fc0223a4246879f55fac8f.tar nixpkgs-415f0fdc9f9bb73294fc0223a4246879f55fac8f.tar.gz nixpkgs-415f0fdc9f9bb73294fc0223a4246879f55fac8f.tar.bz2 nixpkgs-415f0fdc9f9bb73294fc0223a4246879f55fac8f.tar.lz nixpkgs-415f0fdc9f9bb73294fc0223a4246879f55fac8f.tar.xz nixpkgs-415f0fdc9f9bb73294fc0223a4246879f55fac8f.tar.zst nixpkgs-415f0fdc9f9bb73294fc0223a4246879f55fac8f.zip | |
Also fix neon-0.26 build
svn path=/nixpkgs/trunk/; revision=21392
Diffstat (limited to 'pkgs/development/libraries/neon')
| -rw-r--r-- | pkgs/development/libraries/neon/0.26.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/neon/0.26.nix b/pkgs/development/libraries/neon/0.26.nix index c6dde2253bc..6b06e54e73d 100644 --- a/pkgs/development/libraries/neon/0.26.nix +++ b/pkgs/development/libraries/neon/0.26.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 +{ stdenv, fetchurl, libxml2, pkgconfig , compressionSupport ? true, zlib ? null , sslSupport ? true, openssl ? null }: @@ -14,11 +14,13 @@ stdenv.mkDerivation { sha256 = "1pjrn5wb18gy419293hmwd02blmh36aaxsrgajm9nkkkjzqakncj"; }; - buildInputs = [libxml2] ++ stdenv.lib.optional compressionSupport zlib; + buildInputs = [libxml2] + ++ stdenv.lib.optional compressionSupport zlib + ++ (if sslSupport then [ openssl pkgconfig ] else []); configureFlags = '' ${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 ''; |