ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-25 14:48:25 +03:00
Code Issues Projects Releases Wiki Activity

libxmlb: 0.1.10 → 0.1.11

Browse Source 
https://github.com/hughsie/libxmlb/blob/0.1.11/NEWS

Also formatted the expression and added installed tests
This commit is contained in:
Jan Tojnar 2019-08-23 00:31:27 +02:00
parent 8b56d205b2
commit 14056cc908
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 70 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pkgs/development/libraries/libxmlb/default.nix
View File

@ -1,25 +1,64 @@
{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, glib, libuuid, gobject-introspection, gtk-doc, shared-mime-info, python3, docbook_xsl, docbook_xml_dtd_43 }:
{ stdenv
, fetchFromGitHub
, fetchpatch
, docbook_xml_dtd_43
, docbook_xsl
, glib
, gobject-introspection
, gtk-doc
, libuuid
, meson
, ninja
, pkgconfig
, python3
, shared-mime-info
}:
stdenv.mkDerivation rec {
name = "libxmlb-${version}";
version = "0.1.10";
pname = "libxmlb";
version = "0.1.11";
outputs = [ "out" "lib" "dev" "devdoc" ];
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
src = fetchFromGitHub {
owner = "hughsie";
repo = "libxmlb";
rev = version;
sha256 = "1ismh3bdwd0l1fjlhwycam89faxjmpb0wxqlbv58m0z6cxykp6rd";
sha256 = "1503v76w7543snqyjxykiqa5va62zb0ccn3jlw0gpdx8973v80mr";
};
nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ];
patches = [
# Fix installed tests
# https://github.com/hughsie/libxmlb/pull/2
(fetchpatch {
url = "https://github.com/hughsie/libxmlb/commit/78850c8b0f644f729fa21e2bf9ebed0d9d6010f3.diff";
sha256 = "0zw7c6vy8hscln7za7ijqd9svirach3zdskvbzyxxcsm3xcwxpjm";
})
buildInputs = [ glib libuuid ];
./installed-tests-path.patch
];
nativeBuildInputs = [
docbook_xml_dtd_43
docbook_xsl
gobject-introspection
gtk-doc
meson
ninja
pkgconfig
(python3.withPackages (pkgs: with pkgs; [ setuptools ]))
shared-mime-info
];
buildInputs = [
glib
libuuid
];
mesonFlags = [
"--libexecdir=${placeholder "out"}/libexec"
"-Dgtkdoc=true"
"-Dinstalled_test_prefix=${placeholder "installedTests"}"
];
preCheck = ''

24
pkgs/development/libraries/libxmlb/installed-tests-path.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/meson.build b/meson.build
index b064cb8..1a470cf 100644
--- a/meson.build
+++ b/meson.build
@@ -103,8 +103,8 @@
libexecdir = join_paths(prefix, get_option('libexecdir'))
datadir = join_paths(prefix, get_option('datadir'))
-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())
gio = dependency('gio-2.0', version : '>= 2.45.8')
uuid = dependency('uuid')
diff --git a/meson_options.txt b/meson_options.txt
index 27e8cb6..74548ae 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,3 +2,4 @@
option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
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')