@@ -1,4 +1,4 @@
1−{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gettext
1+{ lib, stdenv, substituteAll, fetchFromGitHub, meson, ninja, pkg-config, gettext
22, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt
33, libstemmer, glib, xapian, libxml2, libyaml, gobject-introspection
44, pcre, itstool, gperf, vala, lmdb, libsoup
@@ -6,7 +6,7 @@
66
77stdenv.mkDerivation rec {
88 pname = "appstream";
9− version = "0.13.1";
9+ version = "0.14.0";
1010
1111 outputs = [ "out" "dev" ];
1212
@@ -14,9 +14,17 @@ stdenv.mkDerivation rec {
1414 owner = "ximion";
1515 repo = "appstream";
1616 rev = "v${version}";
17− sha256 = "16nxaw4fx78maldi3kvr8fiwzhmy5276wd4x2fxny16zzf01098j";
17+ sha256 = "sha256-iYqmQ1/58t3ZdJTxYLDc5jkTG1lMBtQWMFFsYsszH9Q=";
1818 };
1919
20+ patches = [
21+ # Fix hardcoded paths
22+ (substituteAll {
23+ src = ./fix-paths.patch;
24+ libstemmer_includedir = "${lib.getDev libstemmer}/include";
25+ })
26+ ];
27+
2028 nativeBuildInputs = [
2129 meson ninja pkg-config gettext
2230 libxslt xmlto docbook_xsl docbook_xml_dtd_45
@@ -25,14 +33,6 @@ stdenv.mkDerivation rec {
2533
2634 buildInputs = [ libstemmer pcre glib xapian libxml2 libyaml gperf lmdb libsoup ];
2735
28− prePatch = ''
29− substituteInPlace meson.build \
30− --replace /usr/include ${libstemmer}/include
31−
32− substituteInPlace data/meson.build \
33− --replace /etc $out/etc
34− '';
35−
3636 mesonFlags = [
3737 "-Dapidocs=false"
3838 "-Ddocs=false"