summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-01 21:38:40 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-04 14:54:51 +0200
commit513bd8bd2226c6191b8086e1c1dac9198d8b8a84 (patch)
treeb1b01a6c76373aede5e340e83a8d90d48407133f /pkgs
parenteae17c3743bd8ea710308db7fad4602c97ff7893 (diff)
downloadnixlib-513bd8bd2226c6191b8086e1c1dac9198d8b8a84.tar
nixlib-513bd8bd2226c6191b8086e1c1dac9198d8b8a84.tar.gz
nixlib-513bd8bd2226c6191b8086e1c1dac9198d8b8a84.tar.bz2
nixlib-513bd8bd2226c6191b8086e1c1dac9198d8b8a84.tar.lz
nixlib-513bd8bd2226c6191b8086e1c1dac9198d8b8a84.tar.xz
nixlib-513bd8bd2226c6191b8086e1c1dac9198d8b8a84.tar.zst
nixlib-513bd8bd2226c6191b8086e1c1dac9198d8b8a84.zip
Revert "libmicrohttpd: Modernize"
This reverts commit c5d13d4fe96674a4fcb04b54ea552847302e13ee.
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/libraries/libmicrohttpd/default.nix69
1 files changed, 21 insertions, 48 deletions
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 9eca6bd84b99..8b9f6f1dca57 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -1,65 +1,38 @@
-{ stdenv, fetchurl, pkgconfig
-, curl
+{stdenv, fetchurl, curl, libgcrypt}:
 
-# 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 {
-  name = "libmicrohttpd-0.9.41";
+  name = "libmicrohttpd-0.9.38";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
+    sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = optional doCheck curl
-    ++ optionals hasSpdy [ optOpenssl optZlib ]
-    ++ optionals hasHttps [ optLibgcrypt optGnutls ];
+  buildInputs = [ curl libgcrypt ];
 
-  configureFlags = [
-    (mkWith   true                 "threads"       "posix")
-    (mkEnable true                 "doc"           null)
-    (mkEnable false                "examples"      null)
-    (mkEnable true                 "epoll"         "auto")
-    (mkEnable doCheck              "curl"          null)
-    (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)
-  ];
+  preCheck =
+    # Since `localhost' can't be resolved in a chroot, work around it.
+    '' for i in "src/test"*"/"*.[ch]
+       do
+         sed -i "$i" -es/localhost/127.0.0.1/g
+       done
+    '';
 
   # Disabled because the tests can time-out.
   doCheck = false;
 
   meta = {
     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/;
-    license = licenses.lgpl2Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ wkennington ];
+
+    maintainers = [ ];
   };
 }