json-glib: 1.6.2 → 1.6.6

+16 -9
+16 -9
pkgs/development/libraries/json-glib/default.nix
··· 9 9 , withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform 10 10 , gobject-introspection 11 11 , fixDarwinDylibNames 12 - , gtk-doc 13 - , docbook-xsl-nons 14 - , docbook_xml_dtd_43 12 + , gi-docgen 15 13 , gnome 16 14 }: 17 15 18 16 stdenv.mkDerivation rec { 19 17 pname = "json-glib"; 20 - version = "1.6.2"; 18 + version = "1.6.6"; 21 19 22 20 outputs = [ "out" "dev" ] 23 21 ++ lib.optional withIntrospection "devdoc"; 24 22 25 23 src = fetchurl { 26 24 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 27 - sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"; 25 + sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4="; 28 26 }; 29 27 30 28 strictDeps = true; ··· 39 37 pkg-config 40 38 gettext 41 39 glib 42 - docbook-xsl-nons 43 - docbook_xml_dtd_43 44 40 ] ++ lib.optional stdenv.hostPlatform.isDarwin [ 45 41 fixDarwinDylibNames 46 42 ] ++ lib.optionals withIntrospection [ 47 43 gobject-introspection 48 - gtk-doc 44 + gi-docgen 49 45 ]; 50 46 51 47 propagatedBuildInputs = [ ··· 54 50 55 51 mesonFlags = lib.optionals (!withIntrospection) [ 56 52 "-Dintrospection=disabled" 57 - # doc gen uses introspection, doesn't work properly 53 + # gi-docgen relies on introspection data 58 54 "-Dgtk_doc=disabled" 59 55 ]; 60 56 61 57 doCheck = true; 58 + 59 + postFixup = '' 60 + # Move developer documentation to devdoc output. 61 + # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. 62 + if [[ -d "$out/share/doc" ]]; then 63 + find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ 64 + | while IFS= read -r -d ''' file; do 65 + moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" 66 + done 67 + fi 68 + ''; 62 69 63 70 passthru = { 64 71 updateScript = gnome.updateScript {