Merge branch 'master' into staging

pkgs/development/libraries/libbrotli/default.nix

@@ -1,17 +1,18 @@
-{stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable}:
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, brotliUnstable }:
 
 stdenv.mkDerivation rec {
-  name = "libbrotli-20160120";
-  version = "53d53e8";
+  name = "libbrotli-${version}";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "bagder";
     repo = "libbrotli";
-    rev = "53d53e8d9c0d37398d37bac2e7a7aa20b0025e9e";
-    sha256 = "10r4nx6n1r54f5cjck5mmmsj7bkasnmmz7m84imhil45q73kzd4m";
+    rev = name;
+    sha256 = "0apd3hpy3vaa7brkv8v0xwz05zbd5xv86rcbkwns4x39klba3m3y";
   };
 
-  buildInputs = [autoconf automake libtool];
+  nativeBuildInputs = [ autoconf automake libtool ];
+
   preConfigure = ''
     cp -r ${brotliUnstable.src}/* brotli/
     chmod -R +700 brotli

pkgs/development/libraries/libvncserver/default.nix

@@ -1,7 +1,7 @@
 {stdenv, fetchurl,
   libtool, libjpeg, openssl, libX11, libXdamage, xproto, damageproto, 
   xextproto, libXext, fixesproto, libXfixes, xineramaproto, libXinerama, 
-  libXrandr, randrproto, libXtst, zlib
+  libXrandr, randrproto, libXtst, zlib, libgcrypt
 }:
 
 assert stdenv.isLinux;
@@ -19,7 +19,7 @@ let
   buildInputs = [
     libtool libjpeg openssl libX11 libXdamage xproto damageproto
     xextproto libXext fixesproto libXfixes xineramaproto libXinerama
-    libXrandr randrproto libXtst zlib
+    libXrandr randrproto libXtst zlib libgcrypt
   ];
 in
 stdenv.mkDerivation {

pkgs/development/libraries/vulkan-loader/default.nix

@@ -63,7 +63,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "LunarG Vulkan loader";
-    homepage    = http://www.lunarg.com;
+    homepage    = "http://www.lunarg.com";
     platforms   = platforms.linux;
+    license     = licenses.asl20;
   };
 }