diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-29 09:53:21 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-10-29 09:53:21 +0100 |
| commit | bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40 (patch) | |
| tree | 1431fc935bb15892ebdc67a1b607263639d199c5 /pkgs/development/libraries/gtk | |
| parent | 0ea9003659408184fcfac9e24fef268ad7e91d58 (diff) | |
| parent | 3281d30b7cfb858cbf7c1ea4ff1e18b530c10d75 (diff) | |
| download | nixpkgs-bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40.tar nixpkgs-bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40.tar.gz nixpkgs-bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40.tar.bz2 nixpkgs-bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40.tar.lz nixpkgs-bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40.tar.xz nixpkgs-bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40.tar.zst nixpkgs-bcf59bbfcb6c8507b6664d06e75ef7b1249e6f40.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/development/libraries/gtk')
| -rw-r--r-- | pkgs/development/libraries/gtk/3.x.nix | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 15c3ab2daf8..c88e193740d 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -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 |