Merge branch 'master.upstream' into staging.upstream

pkgs/development/libraries/libsoup/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, glib, libxml2, pkgconfig
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
+, gnomeSupport ? false, libgnome_keyring, sqlite, glib_networking, gobjectIntrospection
 , libintlOrEmpty
 , intltool, python }:
 let
@@ -32,6 +32,8 @@ stdenv.mkDerivation {
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
+  postInstall = "rm -rf $out/share/gtk-doc";
+
   meta = {
     inherit (glib.meta) maintainers platforms;
   };