JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libmicrohttpd: Fix build and drop curl dependency

Browse Source 
Curl was only used for the test suite, which was disabled anyway.
This commit is contained in:
Eelco Dolstra 2015-06-02 11:41:30 +02:00
parent 020cb43f55
commit f1f7bd9a93
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/libraries/libmicrohttpd/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, curl, libgcrypt}: { lib, stdenv, fetchurl, libgcrypt }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libmicrohttpd-0.9.38"; name = "libmicrohttpd-0.9.38";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld"; sha256 = "08g7p4l0p2fsjj8ayl68zq1bqgrn0pck19bm8yd7k61whvfv9wld";
}; };
buildInputs = [ curl libgcrypt ]; buildInputs = [ libgcrypt ];
preCheck = preCheck =
# Since `localhost' can't be resolved in a chroot, work around it. # 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. 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/; homepage = http://www.gnu.org/software/libmicrohttpd/;
maintainers = [ ]; maintainers = [ lib.maintainers.eelco ];
}; };
} }

5
pkgs/top-level/all-packages.nix
View File

@ -6959,10 +6959,7 @@ let
libmemcached = callPackage ../development/libraries/libmemcached { }; libmemcached = callPackage ../development/libraries/libmemcached { };
libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { libmicrohttpd = callPackage ../development/libraries/libmicrohttpd { };
openssl = null;
gnutls = null;
};
libmikmod = callPackage ../development/libraries/libmikmod { }; libmikmod = callPackage ../development/libraries/libmikmod { };