Merge master into staging-next

2019-02-16 09:29:54 +01:00
parent 5a322693f4 039f359a7d
commit 6fe10d2779
202 changed files with 4386 additions and 3640 deletions
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
  buildInputs = [
    fontconfig freetype libpng zlib libjpeg openssl
    libX11 libXext libXrender
-    qt5.qtwebkit qt5.qtsvg
+    qt5.qtwebkit qt5.qtsvg qt5.qtxmlpatterns
  ];

  prePatch = ''