Merge staging-next into staging

This commit is contained in:
Frederik Rietdijk
2019-11-11 12:09:26 +01:00
442 changed files with 23507 additions and 19144 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
{ stdenv, fetchurl, nixosTests, fixDarwinDylibNames, meson, ninja, pkgconfig, gettext, python3, libxml2, libxslt, docbook_xsl
, docbook_xml_dtd_43, gtk-doc, glib, libtiff, libjpeg, libpng, libX11, gnome3
, jasper, gobject-introspection, doCheck ? false, makeWrapper }:
@@ -85,6 +85,10 @@ in stdenv.mkDerivation rec {
packageName = pname;
};
tests = {
installedTests = nixosTests.installed-tests.gdk-pixbuf;
};
# gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc
moduleDir = "lib/gdk-pixbuf-2.0/2.10.0/loaders";
};