Merge branch 'master' into closure-size

pkgs/development/libraries/grantlee/5.x.nix

@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
 
     homepage = http://gitorious.org/grantlee;
     maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (qt5.base.meta) platforms;
+    inherit (qtbase.meta) platforms;
   };
 }

pkgs/development/libraries/libchewing/default.nix

@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, sqlite }:
+
+stdenv.mkDerivation rec{
+  name = "libchewing-${version}";
+  version = "0.4.0";
+
+  src = fetchurl {
+    url = "https://github.com/chewing/libchewing/releases/download/v${version}/libchewing-${version}.tar.bz2";
+    sha256 = "1j5g5j4w6yp73k03pmsq9n2r0p458hqriq0sd5kisj9xrssbynp5";
+  };
+
+  buildInputs = [ sqlite ];
+
+  meta = with stdenv.lib; {
+    description = "Intelligent Chinese phonetic input method";
+    homepage = http://chewing.im/;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.ericsagnes ];
+    platforms = platforms.linux;
+  };
+}

pkgs/development/libraries/libcli/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  makeFlags = "PREFIX=$(out)";
+  makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Emulate a Cisco-style telnet command-line interface";

pkgs/development/libraries/libdevil/default.nix

@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     sed -i 's, -std=gnu99,,g' configure
     sed -i 's,malloc.h,stdlib.h,g' src-ILU/ilur/ilur.c
+  '' + stdenv.lib.optionalString stdenv.cc.isClang ''
+    sed -i 's/libIL_la_CXXFLAGS = $(AM_CFLAGS)/libIL_la_CXXFLAGS =/g' lib/Makefile.in
   '';
 
   postConfigure = ''

pkgs/development/libraries/libpsl/default.nix

@@ -41,7 +41,7 @@ in stdenv.mkDerivation {
     # The libpsl check phase requires the list's test scripts (tests/) as well
     cp -Rv "${listSources}"/* list
   '';
-  configureFlags = "--disable-static --enable-gtk-doc --enable-man";
+  configureFlags = [ "--disable-static" "--enable-gtk-doc" "--enable-man" ];
 
   enableParallelBuilding = true;
 

pkgs/development/libraries/mailcore2/default.nix

@@ -23,7 +23,10 @@ stdenv.mkDerivation rec {
     substituteInPlace CMakeLists.txt \
        --replace "tidy/tidy.h" "tidy.h" \
        --replace "/usr/include/tidy" "${libtidy}/include" \
-       --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" \
+       --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2"
+    substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \
+      --replace buffio.h tidybuffio.h
+>>>>>>> master
   '';
 
   cmakeFlags = [

pkgs/development/libraries/wolfssl/default.nix

@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec {
+  name = "wolfssl-${version}";
+  version = "3.7.0";
+
+  src = fetchurl {
+    url    = "https://github.com/wolfSSL/wolfssl/archive/v${version}.tar.gz";
+    sha256 = "1r1awivral4xjjvnna9lrfz2rh84rcbp04834rymbsz0kbyykgb6";
+  };
+
+  nativeBuildInputs = [ autoconf automake libtool ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A small, fast, portable implementation of TLS/SSL for embedded devices.";
+    homepage    = "https://www.wolfssl.com/";
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ mcmtroffaes ];
+  };
+}