Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

appstream: 0.10.6 -> 0.11.8

+34 -16
+34 -16
pkgs/development/libraries/appstream/default.nix
··· 1 - { stdenv, fetchFromGitHub, cmake, pkgconfig, gettext, intltool 2 - , xmlto, docbook_xsl, docbook_xml_dtd_45 3 - , glib, xapian, libxml2, libyaml, gobjectIntrospection 1 + { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext 2 + , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt 3 + , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection 4 4 , pcre, itstool 5 5 }: 6 6 7 7 stdenv.mkDerivation rec { 8 8 name = "appstream-${version}"; 9 - version = "0.10.6"; 9 + version = "0.11.8"; 10 10 11 11 src = fetchFromGitHub { 12 - owner = "ximion"; 13 - repo = "appstream"; 14 - rev = "APPSTREAM_0_10_6"; 15 - sha256 = "1fg7zxx2qhkyj7fmcpwbf80b72d16kyi8dadi111kf00sgzfbiyy"; 12 + owner = "ximion"; 13 + repo = "appstream"; 14 + rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; 15 + sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; 16 16 }; 17 + 18 + patches = [ 19 + # drop this in version 0.11.9 and above 20 + (fetchpatch { 21 + name = "define-location-and-soname.patch"; 22 + url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch"; 23 + sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w"; 24 + }) 25 + ]; 17 26 18 27 nativeBuildInputs = [ 19 - cmake pkgconfig gettext intltool 20 - xmlto docbook_xsl docbook_xml_dtd_45 28 + meson ninja pkgconfig gettext 29 + libxslt xmlto docbook_xsl docbook_xml_dtd_45 21 30 gobjectIntrospection itstool 22 31 ]; 23 32 24 - buildInputs = [ pcre glib xapian libxml2 libyaml ]; 33 + buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; 34 + 35 + prePatch = '' 36 + substituteInPlace meson.build \ 37 + --replace /usr/include ${libstemmer}/include 38 + 39 + substituteInPlace data/meson.build \ 40 + --replace /etc $out/etc 41 + ''; 25 42 26 - cmakeFlags = '' 27 - -DSTEMMING=off 28 - ''; 43 + mesonFlags = [ 44 + "-Dapidocs=false" 45 + "-Ddocs=false" 46 + "-Dgir=false" 47 + ]; 29 48 30 49 meta = with stdenv.lib; { 31 50 description = "Software metadata handling library"; 32 51 homepage = https://www.freedesktop.org/wiki/Distributions/AppStream/; 33 - longDescription = 34 - '' 52 + longDescription = '' 35 53 AppStream is a cross-distro effort for building Software-Center applications 36 54 and enhancing metadata provided by software components. It provides 37 55 specifications for meta-information which is shipped by upstream projects and