mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 16:43:58 +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.
20 lines
1.2 KiB
Diff
20 lines
1.2 KiB
Diff
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -111,7 +111,7 @@ else
|
|
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')
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -3,4 +3,5 @@ option('introspection', type : 'boolean', value : true, description : 'generate
|
|
option('tests', type : 'boolean', value : true, description : 'enable tests')
|
|
option('stemmer', type : 'boolean', value : false, description : 'enable stemmer support')
|
|
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
|
|
option('cli', type : 'boolean', value : true, description : 'build and install the xb-tool CLI')
|