Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs

1 files changed, 5 insertions, 20 deletions

diff --git a/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch b/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch
index 2f1249daef41..8ad11abecada 100644
--- a/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch
+++ b/nixpkgs/pkgs/development/libraries/appstream/fix-paths.patch
@@ -1,28 +1,13 @@
-diff --git a/data/meson.build b/data/meson.build
-index 53f31cb4..90f40e77 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -68,7 +68,7 @@ test('as-validate_metainfo.cli',
- )
- 
- install_data('appstream.conf',
--             install_dir: get_option('sysconfdir'))
-+             install_dir: get_option('prefix') / 'etc')
- 
- if get_option('compose')
-     ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml'
 diff --git a/meson.build b/meson.build
-index 2efe86b7..9dc79e28 100644
+index 5e7f57d5..3fe89e8c 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -107,12 +107,12 @@ if get_option ('gir')
-     dependency('gobject-introspection-1.0', version: '>=1.56')
- endif
- 
--stemmer_inc_dirs = include_directories(['/usr/include'])
-+stemmer_inc_dirs = include_directories(['@libstemmer_includedir@'])
+@@ -171,10 +171,10 @@ endif
+ stemmer_inc_dirs = include_directories()
  if get_option('stemming')
      stemmer_lib = cc.find_library('stemmer', required: true)
+-    stemmer_inc_dirs = include_directories(['/usr/include'])
++    stemmer_inc_dirs = include_directories(['@libstemmer_includedir@'])
      if not cc.has_header('libstemmer.h')
          if cc.has_header('libstemmer/libstemmer.h')
 -            stemmer_inc_dirs = include_directories('/usr/include/libstemmer')