appstream: 0.14.0 -> 0.14.3

Fixes build with recent glib. Also clean up.
This commit is contained in:
Jan Tojnar 2021-04-14 00:07:42 +02:00
parent 820dbe6d27
commit bf9c36fb62
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4

View File

@ -1,12 +1,32 @@
{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext { lib
, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt , stdenv
, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection , substituteAll
, pcre, itstool, gperf, vala, lmdb, libsoup , fetchFromGitHub
, meson
, ninja
, pkg-config
, gettext
, xmlto
, docbook-xsl-nons
, docbook_xml_dtd_45
, libxslt
, libstemmer
, glib
, xapian
, libxml2
, libyaml
, gobject-introspection
, pcre
, itstool
, gperf
, vala
, lmdb
, curl
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "appstream"; pname = "appstream";
version = "0.14.0"; version = "0.14.3";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
@ -14,7 +34,7 @@ stdenv.mkDerivation rec {
owner = "ximion"; owner = "ximion";
repo = "appstream"; repo = "appstream";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q="; sha256 = "sha256-wCQR+4/F5lVqWHHcH/WS4irBGRivz3c1imasyLDIZIs=";
}; };
patches = [ patches = [
@ -26,12 +46,30 @@ stdenv.mkDerivation rec {
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkg-config gettext meson
libxslt xmlto docbook_xsl docbook_xml_dtd_45 ninja
gobject-introspection itstool vala pkg-config
gettext
libxslt
xmlto
docbook-xsl-nons
docbook_xml_dtd_45
gobject-introspection
itstool
vala
]; ];
buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ]; buildInputs = [
libstemmer
pcre
glib
xapian
libxml2
libyaml
gperf
lmdb
curl
];
mesonFlags = [ mesonFlags = [
"-Dapidocs=false" "-Dapidocs=false"