public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libxmlb: 0.1.13 → 0.1.14

Browse Source 
412a991890
This commit is contained in:
Jan Tojnar 2019-12-04 13:40:27 +01:00
parent a21c2fa3ea
commit 4be1d742b7
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,6 @@
, glib , glib
, gobject-introspection , gobject-introspection
, gtk-doc , gtk-doc
, libuuid
, meson , meson
, ninja , ninja
, pkgconfig , pkgconfig
@ -16,7 +15,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libxmlb"; pname = "libxmlb";
version = "0.1.13"; version = "0.1.14";
outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ];
@ -24,7 +23,7 @@ stdenv.mkDerivation rec {
owner = "hughsie"; owner = "hughsie";
repo = "libxmlb"; repo = "libxmlb";
rev = version; rev = version;
sha256 = "14bk7bk08mjbildak1l7jq7idcyask7384vigpq9zmwai1gax4s7"; sha256 = "05snbv1dvqa96k7xlwi2sj161315kps3baansr9xdpwim5ckmwc6";
}; };
patches = [ patches = [
@ -45,7 +44,6 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib glib
libuuid
]; ];
mesonFlags = [ mesonFlags = [

20
pkgs/development/libraries/libxmlb/installed-tests-path.patch
View File

@ -1,18 +1,18 @@
diff --git a/meson.build b/meson.build diff --git a/meson.build b/meson.build
index b064cb8..1a470cf 100644 index 38486c9..c567613 100644
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -103,8 +103,8 @@ @@ -110,8 +110,8 @@
prefix = get_option('prefix')
libexecdir = join_paths(prefix, get_option('libexecdir')) datadir = join_paths(prefix, get_option('datadir'))
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_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name())
-installed_test_datadir = join_paths(datadir, '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_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()) + 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') gio = dependency('gio-2.0', version : '>= 2.45.8')
uuid = dependency('uuid')
diff --git a/meson_options.txt b/meson_options.txt diff --git a/meson_options.txt b/meson_options.txt
index 27e8cb6..74548ae 100644 index 27e8cb6..74548ae 100644
--- a/meson_options.txt --- a/meson_options.txt