Revert "libmicrohttpd: Modernize"

This reverts commit c5d13d4fe9.
This commit is contained in:
Eelco Dolstra
2015-06-04 14:54:51 +02:00
parent eae17c3743
commit 513bd8bd22
@@ -1,65 +1,38 @@
{ stdenv, fetchurl, pkgconfig {stdenv, fetchurl, curl, libgcrypt}:
, curl
# Optional Dependencies
, openssl ? null, zlib ? null, libgcrypt ? null, gnutls ? null
}:
let
mkFlag = trueStr: falseStr: cond: name: val:
if cond == null then null else
"--${if cond != false then trueStr else falseStr}${name}${if val != null && cond != false then "=${val}" else ""}";
mkEnable = mkFlag "enable-" "disable-";
mkWith = mkFlag "with-" "without-";
mkOther = mkFlag "" "" true;
shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
optOpenssl = shouldUsePkg openssl;
optZlib = shouldUsePkg zlib;
hasSpdy = optOpenssl != null && optZlib != null;
optLibgcrypt = shouldUsePkg libgcrypt;
optGnutls = shouldUsePkg gnutls;
hasHttps = optLibgcrypt != null && optGnutls != null;
in
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmicrohttpd-0.9.41"; name = "libmicrohttpd-0.9.38";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/libmicrohttpd/${name}.tar.gz"; url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p"; sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld";
}; };
nativeBuildInputs = [ pkgconfig ]; buildInputs = [ curl libgcrypt ];
buildInputs = optional doCheck curl
++ optionals hasSpdy [ optOpenssl optZlib ]
++ optionals hasHttps [ optLibgcrypt optGnutls ];
configureFlags = [ preCheck =
(mkWith true "threads" "posix") # Since `localhost' can't be resolved in a chroot, work around it.
(mkEnable true "doc" null) '' for i in "src/test"*"/"*.[ch]
(mkEnable false "examples" null) do
(mkEnable true "epoll" "auto") sed -i "$i" -es/localhost/127.0.0.1/g
(mkEnable doCheck "curl" null) done
(mkEnable hasSpdy "spdy" null) '';
(mkEnable true "messages" null)
(mkEnable true "postprocessor" null)
(mkWith hasHttps "gnutls" null)
(mkEnable hasHttps "https" null)
(mkEnable true "bauth" null)
(mkEnable true "dauth" null)
];
# Disabled because the tests can time-out. # Disabled because the tests can time-out.
doCheck = false; doCheck = false;
meta = { meta = {
description = "Embeddable HTTP server library"; description = "Embeddable HTTP server library";
longDescription = ''
GNU libmicrohttpd is a small C library that is supposed to make
it easy to run an HTTP server as part of another application.
'';
license = stdenv.lib.licenses.lgpl2Plus;
homepage = http://www.gnu.org/software/libmicrohttpd/; homepage = http://www.gnu.org/software/libmicrohttpd/;
license = licenses.lgpl2Plus;
platforms = platforms.all; maintainers = [ ];
maintainers = with maintainers; [ wkennington ];
}; };
} }