mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-14 17:04:42 +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.
24 lines
1.2 KiB
Diff
24 lines
1.2 KiB
Diff
diff --git a/meson.build b/meson.build
|
|
index dee932dc..f8851913 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -16,8 +16,8 @@
|
|
photos_docdir = join_paths(photos_datadir, 'doc', meson.project_name())
|
|
photos_libdir = join_paths(photos_prefix, get_option('libdir'), meson.project_name())
|
|
|
|
-photos_installed_test_metadir = join_paths(photos_datadir, 'installed-tests', meson.project_name())
|
|
-photos_installed_test_execdir = join_paths(photos_libexecdir, 'installed-tests', meson.project_name())
|
|
+photos_installed_test_metadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name())
|
|
+photos_installed_test_execdir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name())
|
|
|
|
photos_namespace = 'org.gnome.Photos'
|
|
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index f34b5cc0..8e09970b 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -1,2 +1,3 @@
|
|
option('dogtail', type: 'boolean', value: true, description: 'test using dogtail')
|
|
option('installed_tests', type: 'boolean', value: false, description: 'Enable installation of some test cases')
|
|
+option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests')
|