Merge staging-next into staging

2019-02-16 09:30:46 +01:00
parent a0eb6c1f81 6fe10d2779
commit fd48a94b62
141 changed files with 1308 additions and 691 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 = ''