pyrox.dev
lol
appstream: 0.15.5 → 1.0.1
https://github.com/ximion/appstream/compare/v0.15.5...v1.0.1
Co-authored-by: Bobby Rong <rjl931189261@126.com>
authored by
K900
Bobby Rong
and committed by
Bobby Rong
0426692a
b0d36bd0
+22
-26
+8
-2
pkgs/development/libraries/appstream/default.nix
+8
-2
pkgs/development/libraries/appstream/default.nix
···
23
23
, gperf
24
24
, vala
25
25
, curl
26
+
, systemd
26
27
, nixosTests
28
+
, withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
27
29
}:
28
30
29
31
stdenv.mkDerivation rec {
30
32
pname = "appstream";
31
-
version = "0.15.5";
33
+
version = "1.0.1";
32
34
33
35
outputs = [ "out" "dev" "installedTests" ];
34
36
···
36
38
owner = "ximion";
37
39
repo = "appstream";
38
40
rev = "v${version}";
39
-
sha256 = "sha256-KVZCtu1w5FMgXZMiSW55rbrI6W/A9zWWKKvACtk/jjk=";
41
+
sha256 = "sha256-ULqRHepWVuAluXsXJUoqxqJfrN168MGlwdVkoLLwSN0=";
40
42
};
41
43
42
44
patches = [
···
82
84
libxmlb
83
85
libyaml
84
86
curl
87
+
] ++ lib.optionals withSystemd [
88
+
systemd
85
89
];
86
90
87
91
mesonFlags = [
···
89
93
"-Ddocs=false"
90
94
"-Dvapi=true"
91
95
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
96
+
] ++ lib.optionals (!withSystemd) [
97
+
"-Dsystemd=false"
92
98
];
93
99
94
100
passthru = {
+5
-20
pkgs/development/libraries/appstream/fix-paths.patch
+5
-20
pkgs/development/libraries/appstream/fix-paths.patch
···
1
-
diff --git a/data/meson.build b/data/meson.build
2
-
index 53f31cb4..90f40e77 100644
3
-
--- a/data/meson.build
4
-
+++ b/data/meson.build
5
-
@@ -68,7 +68,7 @@ test('as-validate_metainfo.cli',
6
-
)
7
-
8
-
install_data('appstream.conf',
9
-
- install_dir: get_option('sysconfdir'))
10
-
+ install_dir: get_option('prefix') / 'etc')
11
-
12
-
if get_option('compose')
13
-
ascompose_metainfo = 'org.freedesktop.appstream.compose.metainfo.xml'
14
1
diff --git a/meson.build b/meson.build
15
-
index 2efe86b7..9dc79e28 100644
2
+
index 5e7f57d5..3fe89e8c 100644
16
3
--- a/meson.build
17
4
+++ b/meson.build
18
-
@@ -107,12 +107,12 @@ if get_option ('gir')
19
-
dependency('gobject-introspection-1.0', version: '>=1.56')
20
-
endif
21
-
22
-
-stemmer_inc_dirs = include_directories(['/usr/include'])
23
-
+stemmer_inc_dirs = include_directories(['@libstemmer_includedir@'])
5
+
@@ -171,10 +171,10 @@ endif
6
+
stemmer_inc_dirs = include_directories()
24
7
if get_option('stemming')
25
8
stemmer_lib = cc.find_library('stemmer', required: true)
9
+
- stemmer_inc_dirs = include_directories(['/usr/include'])
10
+
+ stemmer_inc_dirs = include_directories(['@libstemmer_includedir@'])
26
11
if not cc.has_header('libstemmer.h')
27
12
if cc.has_header('libstemmer/libstemmer.h')
28
13
- stemmer_inc_dirs = include_directories('/usr/include/libstemmer')
+9
-4
pkgs/development/libraries/appstream/qt.nix
+9
-4
pkgs/development/libraries/appstream/qt.nix
···
1
-
{ mkDerivation, appstream, qtbase, qttools, nixosTests }:
1
+
{ lib, stdenv, appstream, qtbase, qttools, nixosTests }:
2
2
3
3
# TODO: look into using the libraries from the regular appstream derivation as we keep duplicates here
4
4
5
-
mkDerivation {
5
+
let
6
+
qtSuffix = lib.optionalString (lib.versions.major qtbase.version == "5") "5";
7
+
in
8
+
stdenv.mkDerivation {
6
9
pname = "appstream-qt";
7
10
inherit (appstream) version src;
8
11
···
12
15
13
16
nativeBuildInputs = appstream.nativeBuildInputs ++ [ qttools ];
14
17
15
-
mesonFlags = appstream.mesonFlags ++ [ "-Dqt=true" ];
18
+
mesonFlags = appstream.mesonFlags ++ [ "-Dqt${qtSuffix}=true" ];
16
19
17
20
patches = appstream.patches;
18
21
22
+
dontWrapQtApps = true;
23
+
19
24
postFixup = ''
20
-
sed -i "$dev/lib/cmake/AppStreamQt/AppStreamQtConfig.cmake" \
25
+
sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \
21
26
-e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@"
22
27
'';
23
28