aleksana
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.
25 lines
1.4 KiB
Diff
25 lines
1.4 KiB
Diff
diff --git a/meson.build b/meson.build
|
|
index f69968d..d1d6c6e 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -114,8 +114,8 @@ else
|
|
datadir = join_paths(prefix, get_option('datadir'))
|
|
localstatedir = join_paths(prefix, get_option('localstatedir'))
|
|
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
|
|
mandir = join_paths(prefix, get_option('mandir'))
|
|
localedir = join_paths(prefix, get_option('localedir'))
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index 4784300..d382fc1 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -1,3 +1,4 @@
|
|
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
|
|
option('gtkdoc', type : 'boolean', value : false, description : 'enable developer documentation')
|
|
option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data')
|
|
option('tests', type : 'boolean', value : true, description : 'enable tests')
|