diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-01 15:50:50 +0000 |
commit | 75eafe97f7df0d653bec67f3962214d7c357831f (patch) | |
tree | 09f2cc901e0e637876cbb78d192dfe2fcfef8156 /nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch | |
parent | a53b121bf4331497da63df3b1b7f1a7897dad146 (diff) | |
parent | a2e06fc3423c4be53181b15c28dfbe0bcf67dd73 (diff) | |
download | nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.gz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.bz2 nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.lz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.xz nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.tar.zst nixlib-75eafe97f7df0d653bec67f3962214d7c357831f.zip |
Merge commit 'a2e06fc3423c4be53181b15c28dfbe0bcf67dd73'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch b/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch index ab36d9efad89..4207e9a91d74 100644 --- a/nixpkgs/pkgs/development/libraries/libxmlb/installed-tests-path.patch +++ b/nixpkgs/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 |