push sheeet
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s

This commit is contained in:
Dark Steveneq
2025-10-09 14:15:47 +02:00
commit 646b892680
49168 changed files with 5897842 additions and 0 deletions

View File

@@ -0,0 +1,19 @@
--- a/meson.build
+++ b/meson.build
@@ -111,7 +111,7 @@ else
datadir = join_paths(prefix, get_option('datadir'))
libexecdir = join_paths(prefix, get_option('libexecdir'))
- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name())
+ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
+ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
endif
gio = dependency('gio-2.0', version : '>= 2.45.8')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,4 +3,5 @@ option('introspection', type : 'boolean', value : true, description : 'generate
option('tests', type : 'boolean', value : true, description : 'enable tests')
option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support')
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI')

View File

@@ -0,0 +1,96 @@
{
stdenv,
lib,
fetchFromGitHub,
docbook_xml_dtd_43,
docbook-xsl-nons,
glib,
gobject-introspection,
gtk-doc,
meson,
ninja,
pkg-config,
python3,
shared-mime-info,
nixosTests,
xz,
zstd,
buildPackages,
withIntrospection ?
lib.meta.availableOn stdenv.hostPlatform gobject-introspection
&& stdenv.hostPlatform.emulatorAvailable buildPackages,
}:
stdenv.mkDerivation rec {
pname = "libxmlb";
version = "0.3.24";
outputs = [
"out"
"lib"
"dev"
"installedTests"
]
++ lib.optionals withIntrospection [
"devdoc"
];
src = fetchFromGitHub {
owner = "hughsie";
repo = "libxmlb";
rev = version;
hash = "sha256-3Yxq0KZMV9GRmNjZ19eIqGq+UJS4PGyVPS6HBcMEbHo=";
};
patches = [
./installed-tests-path.patch
];
nativeBuildInputs = [
docbook_xml_dtd_43
docbook-xsl-nons
meson
ninja
pkg-config
python3
shared-mime-info
]
++ lib.optionals withIntrospection [
gobject-introspection
gtk-doc
];
buildInputs = [
glib
xz
zstd
];
mesonFlags = [
"--libexecdir=${placeholder "out"}/libexec"
(lib.mesonBool "gtkdoc" withIntrospection)
(lib.mesonBool "introspection" withIntrospection)
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
preCheck = ''
export XDG_DATA_DIRS=$XDG_DATA_DIRS:${shared-mime-info}/share
'';
doCheck = true;
passthru = {
tests = {
installed-tests = nixosTests.installed-tests.libxmlb;
};
};
meta = with lib; {
description = "Library to help create and query binary XML blobs";
mainProgram = "xb-tool";
homepage = "https://github.com/hughsie/libxmlb";
license = licenses.lgpl21Plus;
maintainers = [ ];
platforms = platforms.unix;
};
}