diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index 75fffa83d24b..5ff5209020ce 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -5,7 +5,6 @@ , glib , gobject-introspection , gtk-doc -, libuuid , meson , ninja , pkgconfig @@ -16,7 +15,7 @@ stdenv.mkDerivation rec { pname = "libxmlb"; - version = "0.1.13"; + version = "0.1.14"; outputs = [ "out" "lib" "dev" "devdoc" "installedTests" ]; @@ -24,7 +23,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "14bk7bk08mjbildak1l7jq7idcyask7384vigpq9zmwai1gax4s7"; + sha256 = "05snbv1dvqa96k7xlwi2sj161315kps3baansr9xdpwim5ckmwc6"; }; patches = [ @@ -45,7 +44,6 @@ stdenv.mkDerivation rec { buildInputs = [ glib - libuuid ]; mesonFlags = [ diff --git a/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/pkgs/development/libraries/libxmlb/installed-tests-path.patch index ab36d9efad89..4207e9a91d74 100644 --- a/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/pkgs/development/libraries/libxmlb/installed-tests-path.patch @@ -1,18 +1,18 @@ diff --git a/meson.build b/meson.build -index b064cb8..1a470cf 100644 +index 38486c9..c567613 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()) +@@ -110,8 +110,8 @@ + prefix = get_option('prefix') + 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') - uuid = dependency('uuid') diff --git a/meson_options.txt b/meson_options.txt index 27e8cb6..74548ae 100644 --- a/meson_options.txt