Merge staging into staging-next

2019-10-29 09:53:21 +01:00
parent 0ea9003659 3281d30b7c
commit bcf59bbfcb
5 changed files with 31 additions and 5 deletions
@@ -3,6 +3,9 @@
 , fetchpatch
 , pkgconfig
 , gettext
+, docbook_xsl
+, docbook_xml_dtd_43
+, gtk-doc
 , meson
 , ninja
 , python3
@@ -46,7 +49,7 @@ stdenv.mkDerivation rec {
  pname = "gtk+3";
  version = "3.24.12";

-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "devdoc" ];
  outputBin = "dev";

  setupHooks = [
@@ -78,6 +81,7 @@ stdenv.mkDerivation rec {
  separateDebugInfo = stdenv.isLinux;

  mesonFlags = [
+    "-Dgtk_doc=true"
    "-Dtests=false"
  ];

@@ -105,7 +109,10 @@ stdenv.mkDerivation rec {
  '';

  nativeBuildInputs = [
+    docbook_xml_dtd_43
+    docbook_xsl
    gettext
+    gtk-doc
    gobject-introspection
    makeWrapper
    meson