Sergei Trofimovich 2023-10-19 17:39:07 +01:00
parent c22fed2281
commit 76460f7e73
2 changed files with 7 additions and 9 deletions

View file

@ -13,11 +13,12 @@
, shared-mime-info , shared-mime-info
, nixosTests , nixosTests
, xz , xz
, zstd
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxmlb"; pname = "libxmlb";
version = "0.3.10"; version = "0.3.14";
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
owner = "hughsie"; owner = "hughsie";
repo = "libxmlb"; repo = "libxmlb";
rev = version; rev = version;
sha256 = "sha256-uitnVqR2VVNAf8H1Q/u6LezhvfQJ/G2bE0Dv9dyP8+A="; hash = "sha256-lpVXl/n/ecDLbbLQg9T+o4GdGZM7pNXGYTyVogNCl2E=";
}; };
patches = [ patches = [
@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
xz xz
zstd
]; ];
mesonFlags = [ mesonFlags = [

View file

@ -1,9 +1,6 @@
diff --git a/meson.build b/meson.build
index c98e1a7..025d9c8 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -110,8 +110,8 @@ else @@ -111,7 +111,7 @@ else
prefix = get_option('prefix')
datadir = join_paths(prefix, get_option('datadir')) datadir = join_paths(prefix, get_option('datadir'))
libexecdir = join_paths(prefix, get_option('libexecdir')) libexecdir = join_paths(prefix, get_option('libexecdir'))
- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) - installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
@ -13,12 +10,11 @@ index c98e1a7..025d9c8 100644
endif endif
gio = dependency('gio-2.0', version : '>= 2.45.8') gio = dependency('gio-2.0', version : '>= 2.45.8')
diff --git a/meson_options.txt b/meson_options.txt
index 54ab698..8a7122a 100644
--- a/meson_options.txt --- a/meson_options.txt
+++ b/meson_options.txt +++ b/meson_options.txt
@@ -3,3 +3,4 @@ option('introspection', type : 'boolean', value : true, description : 'generate @@ -3,4 +3,5 @@ option('introspection', type : 'boolean', value : true, description : 'generate
option('tests', type : 'boolean', value : true, description : 'enable tests') option('tests', type : 'boolean', value : true, description : 'enable tests')
option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support') option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support')
option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI') option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI')
option('zstd', type : 'boolean', value : true, description : 'enable zstd support')
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') +option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')