appstream: 0.11.8 -> 0.12.2

This commit is contained in:
worldofpeace 2018-08-04 16:16:15 -04:00
parent d279992fc6
commit 1ef8646a73
2 changed files with 5 additions and 14 deletions

View File

@ -1,36 +1,27 @@
{ stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext { stdenv, fetchpatch, fetchFromGitHub, meson, ninja, pkgconfig, gettext
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
, libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection , libstemmer, glib, xapian, libxml2, libyaml, gobjectIntrospection
, pcre, itstool, vala , pcre, itstool, gperf, vala
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "appstream-${version}"; name = "appstream-${version}";
version = "0.11.8"; version = "0.12.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ximion"; owner = "ximion";
repo = "appstream"; repo = "appstream";
rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}"; rev = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
sha256 = "07vzz57g1p5byj2jfg17y5n3il0g07d9wkiynzwra71mcxar1p08"; sha256 = "1g15c4bhyl730rgaiqia3jppraixh05c3yx098lyilidbddxp5xb";
}; };
patches = [
# drop this in version 0.11.9 and above
(fetchpatch {
name = "define-location-and-soname.patch";
url = "https://github.com/ximion/appstream/commit/3e58f9c9.patch";
sha256 = "1ffgbdfg80yq5vahjrvdd4f8xsp32ksm9vyasfmc7hzhx294s78w";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig gettext meson ninja pkgconfig gettext
libxslt xmlto docbook_xsl docbook_xml_dtd_45 libxslt xmlto docbook_xsl docbook_xml_dtd_45
gobjectIntrospection itstool vala gobjectIntrospection itstool vala
]; ];
buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml ]; buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf ];
prePatch = '' prePatch = ''
substituteInPlace meson.build \ substituteInPlace meson.build \

View File

@ -2,7 +2,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "appstream-qt-${version}"; name = "appstream-qt-${version}";
inherit (appstream) version src patches prePatch; inherit (appstream) version src prePatch;
buildInputs = appstream.buildInputs ++ [ appstream qtbase ]; buildInputs = appstream.buildInputs ++ [ appstream qtbase ];