mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-06 04:53:27 +00:00
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.
28 lines
1.1 KiB
Diff
28 lines
1.1 KiB
Diff
diff --git a/json-glib/tests/meson.build b/json-glib/tests/meson.build
|
|
index 1eb56c8..dca444e 100644
|
|
--- a/json-glib/tests/meson.build
|
|
+++ b/json-glib/tests/meson.build
|
|
@@ -21,8 +21,9 @@ test_data = [
|
|
'stream-load.json',
|
|
]
|
|
|
|
-installed_test_bindir = json_libexecdir / 'installed-tests' / json_api_name
|
|
-installed_test_datadir = json_datadir / 'installed-tests' / json_api_name
|
|
+installed_test_prefix = get_option('installed_test_prefix')
|
|
+installed_test_bindir = installed_test_prefix / 'libexec' / 'installed-tests' / json_api_name
|
|
+installed_test_datadir = installed_test_prefix / 'share' / 'installed-tests' / json_api_name
|
|
|
|
install_data(test_data, install_dir: installed_test_bindir)
|
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 5a96998..383aa6c 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -13,3 +13,6 @@ option('tests',
|
|
option('installed_tests',
|
|
type: 'boolean', value: true,
|
|
description: 'Enable installed tests')
|
|
+option('installed_test_prefix',
|
|
+ description: 'Prefix for installed tests',
|
|
+ type: 'string')
|