json-glib: 1.6.2 → 1.6.6

+16 -9
+16 -9
pkgs/development/libraries/json-glib/default.nix
··· 9 , withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform 10 , gobject-introspection 11 , fixDarwinDylibNames 12 - , gtk-doc 13 - , docbook-xsl-nons 14 - , docbook_xml_dtd_43 15 , gnome 16 }: 17 18 stdenv.mkDerivation rec { 19 pname = "json-glib"; 20 - version = "1.6.2"; 21 22 outputs = [ "out" "dev" ] 23 ++ lib.optional withIntrospection "devdoc"; 24 25 src = fetchurl { 26 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 27 - sha256 = "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3"; 28 }; 29 30 strictDeps = true; ··· 39 pkg-config 40 gettext 41 glib 42 - docbook-xsl-nons 43 - docbook_xml_dtd_43 44 ] ++ lib.optional stdenv.hostPlatform.isDarwin [ 45 fixDarwinDylibNames 46 ] ++ lib.optionals withIntrospection [ 47 gobject-introspection 48 - gtk-doc 49 ]; 50 51 propagatedBuildInputs = [ ··· 54 55 mesonFlags = lib.optionals (!withIntrospection) [ 56 "-Dintrospection=disabled" 57 - # doc gen uses introspection, doesn't work properly 58 "-Dgtk_doc=disabled" 59 ]; 60 61 doCheck = true; 62 63 passthru = { 64 updateScript = gnome.updateScript {
··· 9 , withIntrospection ? stdenv.buildPlatform == stdenv.hostPlatform 10 , gobject-introspection 11 , fixDarwinDylibNames 12 + , gi-docgen 13 , gnome 14 }: 15 16 stdenv.mkDerivation rec { 17 pname = "json-glib"; 18 + version = "1.6.6"; 19 20 outputs = [ "out" "dev" ] 21 ++ lib.optional withIntrospection "devdoc"; 22 23 src = fetchurl { 24 url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 25 + sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4="; 26 }; 27 28 strictDeps = true; ··· 37 pkg-config 38 gettext 39 glib 40 ] ++ lib.optional stdenv.hostPlatform.isDarwin [ 41 fixDarwinDylibNames 42 ] ++ lib.optionals withIntrospection [ 43 gobject-introspection 44 + gi-docgen 45 ]; 46 47 propagatedBuildInputs = [ ··· 50 51 mesonFlags = lib.optionals (!withIntrospection) [ 52 "-Dintrospection=disabled" 53 + # gi-docgen relies on introspection data 54 "-Dgtk_doc=disabled" 55 ]; 56 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 + ''; 69 70 passthru = { 71 updateScript = gnome.updateScript {