571c71e6f7
We are migrating packages that meet below requirements: 1. using `callPackage` 2. called path is a directory 3. overriding set is empty (`{ }`) 4. not containing path expressions other than relative path (to makenixpkgs-vet happy) 5. not referenced by nix files outside of the directory, other than`pkgs/top-level/all-packages.nix` 6. not referencing nix files outside of the directory 7. not referencing `default.nix` (since it's changed to `package.nix`) 8. `outPath` doesn't change after migration The tool is here: https://github.com/Aleksanaa/by-name-migrate.
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
diff --git a/libglib-testing/tests/meson.build b/libglib-testing/tests/meson.build
|
|
index 4789c63..2b8525d 100644
|
|
--- a/libglib-testing/tests/meson.build
|
|
+++ b/libglib-testing/tests/meson.build
|
|
@@ -15,9 +15,9 @@ test_programs = [
|
|
['signal-logger', [], deps],
|
|
]
|
|
|
|
-installed_tests_metadir = join_paths(datadir, 'installed-tests',
|
|
+installed_tests_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests',
|
|
'libglib-testing-' + libglib_testing_api_version)
|
|
-installed_tests_execdir = join_paths(libexecdir, 'installed-tests',
|
|
+installed_tests_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests',
|
|
'libglib-testing-' + libglib_testing_api_version)
|
|
|
|
foreach program: test_programs
|
|
@@ -48,4 +48,4 @@ foreach program: test_programs
|
|
exe,
|
|
env: envs,
|
|
)
|
|
-endforeach
|
|
\ No newline at end of file
|
|
+endforeach
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index e69263e..7cb1ee8 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -4,3 +4,4 @@ option(
|
|
value: false,
|
|
description: 'enable installed tests'
|
|
)
|
|
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
|