git.iko.soy/typeable/nixpkgs
on master help sign in
appstream: 0.13.1 -> 0.14.0
commit34e2c2b310a4ede14a9c948b8407e4a9a459b051 authorJan Tojnar <jtojnar@gmail.com> dateThu 11 Feb 2021, 10:20 (6 years ago) parent4ef8bd3
3 files changed+41−12
pkgs/development/libraries/appstream/default.nix+11−11 pkgs/development/libraries/appstream/fix-paths.patch+29 pkgs/development/libraries/appstream/qt.nix+1−1
pkgs/development/libraries/appstream/default.nix+11−11
@@ -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"
pkgs/development/libraries/appstream/fix-paths.patchnew file+29
@@ -0,0 +1,29 @@
1+diff --git a/data/meson.build b/data/meson.build
2+index 1eb3dfb0..623b66ec 100644
3+--- a/data/meson.build
4++++ b/data/meson.build
5+@@ -26,4 +26,4 @@ i18n.merge_file (
6+ )
7+
8+ install_data ('appstream.conf',
9+- install_dir: get_option('sysconfdir'))
10++ install_dir: get_option('prefix') / 'etc')
11+diff --git a/meson.build b/meson.build
12+index dc1fb1a5..5ee03b73 100644
13+--- a/meson.build
14++++ b/meson.build
15+@@ -108,12 +108,12 @@ if get_option ('gir')
16+ dependency('gobject-introspection-1.0', version: '>=1.56')
17+ endif
18+
19+-stemmer_inc_dirs = include_directories(['/usr/include'])
20++stemmer_inc_dirs = include_directories(['@libstemmer_includedir@'])
21+ if get_option('stemming')
22+ stemmer_lib = cc.find_library('stemmer', required: true)
23+ if not cc.has_header('libstemmer.h')
24+ if cc.has_header('libstemmer/libstemmer.h')
25+- stemmer_inc_dirs = include_directories('/usr/include/libstemmer')
26++ stemmer_inc_dirs = include_directories('@libstemmer_includedir@/libstemmer')
27+ else
28+ error('Unable to find Snowball header "libstemmer.h". Please ensure libstemmer/Snowball is installed properly in order to continue.')
29+ endif
pkgs/development/libraries/appstream/qt.nix+1−1
@@ -4,7 +4,7 @@
44
55mkDerivation {
66 pname = "appstream-qt";
7− inherit (appstream) version src prePatch;
7+ inherit (appstream) version src patches;
88
99 outputs = [ "out" "dev" ];
1010