From f1f7bd9a931e4b1f2578ca0c8bc27a5bc2a00b47 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 2 Jun 2015 11:41:30 +0200 Subject: [PATCH] libmicrohttpd: Fix build and drop curl dependency Curl was only used for the test suite, which was disabled anyway. --- pkgs/development/libraries/libmicrohttpd/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 8b9f6f1dca5..f1d5a2c43b0 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, curl, libgcrypt}: +{ lib, stdenv, fetchurl, libgcrypt }: stdenv.mkDerivation rec { name = "libmicrohttpd-0.9.38"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld"; }; - buildInputs = [ curl libgcrypt ]; + buildInputs = [ libgcrypt ]; preCheck = # Since `localhost' can't be resolved in a chroot, work around it. @@ -29,10 +29,10 @@ stdenv.mkDerivation rec { it easy to run an HTTP server as part of another application. ''; - license = stdenv.lib.licenses.lgpl2Plus; + license = lib.licenses.lgpl2Plus; homepage = http://www.gnu.org/software/libmicrohttpd/; - maintainers = [ ]; + maintainers = [ lib.maintainers.eelco ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 529a89befce..e7856b140cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6959,10 +6959,7 @@ let libmemcached = callPackage ../development/libraries/libmemcached { }; - libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { - openssl = null; - gnutls = null; - }; + libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { }; libmikmod = callPackage ../development/libraries/libmikmod { };