mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-14 08:54:46 +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.
30 lines
872 B
Diff
30 lines
872 B
Diff
diff --git a/meson.build b/meson.build
|
|
index 2350a1f..56f015d 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -551,7 +551,7 @@ pkgconfig.generate(
|
|
variables: [
|
|
'datadir=${prefix}/share',
|
|
'pluginsdir=${libdir}/@0@'.format(lib_name),
|
|
- 'girdir=${datadir}/gir-1.0',
|
|
+ 'girdir=@0@/share/gir-1.0'.format(get_option('prefix-dev')),
|
|
'typelibdir=${libdir}/girepository-1.0',
|
|
],
|
|
uninstalled_variables: [
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index f9d558c..3cac593 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -9,6 +9,11 @@ option('enable-gir',
|
|
choices: ['auto', 'true', 'false'],
|
|
description: 'gobject introspection .gir generation'
|
|
)
|
|
+option('prefix-dev',
|
|
+ type: 'string',
|
|
+ value: '',
|
|
+ description: 'Like prefix but for dev output of the package'
|
|
+)
|
|
option('enable-vapi',
|
|
type: 'boolean',
|
|
value: 'true',
|