From 40b66f613181844dc48a8ef4b0d958687c2cfa31 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sat, 6 Jun 2015 12:02:49 -0700
Subject: [PATCH] Revert "libmicrohttpd: 0.9.41 -> 0.9.42"

This reverts commit 89d9a6079cfd88b27295aeac3da355d44620548f.
---
 pkgs/development/libraries/libmicrohttpd/default.nix | 5 ++---
 pkgs/top-level/all-packages.nix                      | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index d88b75440bc2..c7892716c9d6 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -17,11 +17,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libmicrohttpd-0.9.42";
+  name = "libmicrohttpd-0.9.41";
 
   src = fetchurl {
     url = "mirror://gnu/libmicrohttpd/${name}.tar.gz";
-    sha256 = "0nvxmm6z6wcq1vl6l92rids0i0va184y86bkc10dl0vh6rrj0d80";
+    sha256 = "0z3s3aplgxj8cj947i4rxk9wzvg68b8hbn71fyipc7aagmivx64p";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
     (mkWith   true                 "threads"       "posix")
     (mkEnable true                 "doc"           null)
     (mkEnable false                "examples"      null)
-    (mkEnable true                 "poll"          "auto")
     (mkEnable true                 "epoll"         "auto")
     (mkEnable doCheck              "curl"          null)
     (mkEnable hasSpdy              "spdy"          null)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97b79530fa68..7d87d2ac7d3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6927,9 +6927,8 @@ let
 
   libmemcached = callPackage ../development/libraries/libmemcached { };
 
-  libmicrohttpd-full = callPackage ../development/libraries/libmicrohttpd { };
-
-  libmicrohttpd = libmicrohttpd-full.override {
+  libmicrohttpd = callPackage ../development/libraries/libmicrohttpd {
+    openssl = null;
     gnutls = null;
   };