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

Merge branch 'master' into staging

Browse Source 
* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...
This commit is contained in:
Orivej Desh
2017-10-02 00:22:12 +00:00
parent 21976d1fbd 6b8806dff7
commit fda26c8476
260 changed files with 9682 additions and 4403 deletions
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, libgcrypt, curl, gnutls, pkgconfig }:
{ stdenv, fetchurl, libgcrypt, curl, gnutls, pkgconfig, libiconv, libintlOrEmpty }:
stdenv.mkDerivation rec {
name = "libmicrohttpd-0.9.55";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "devdoc" "info" ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ libgcrypt curl gnutls ];
buildInputs = [ libgcrypt curl gnutls ]
++ stdenv.lib.optionals stdenv.isDarwin [ libiconv libintlOrEmpty ];
preCheck = ''
# Since `localhost' can't be resolved in a chroot, work around it.
@@ -33,6 +34,7 @@ stdenv.mkDerivation rec {
homepage = http://www.gnu.org/software/libmicrohttpd/;
maintainers = with maintainers; [ eelco vrthra fpletz ];
platforms = platforms.linux;
platforms = platforms.unix;
};
}