nixpkgs/pkgs/os-specific/linux/firmware/fwupd/install-fwupdplugin-to-out.patch

38 lines
1.2 KiB
Diff

diff --git a/libfwupdplugin/meson.build b/libfwupdplugin/meson.build
index d6a2ed68..12c82a95 100644
--- a/libfwupdplugin/meson.build
+++ b/libfwupdplugin/meson.build
@@ -216,7 +216,8 @@ fwupdplugin = library(
],
link_args : vflag,
link_depends : fwupdplugin_mapfile,
- install : true
+ install : true,
+ install_dir : bindir / '..' / 'lib',
)
fwupdplugin_pkgg = import('pkgconfig')
@@ -276,7 +277,8 @@ if get_option('introspection')
girtargets,
fwupd_gir[0],
],
- install : true
+ install : true,
+ install_dir_typelib : bindir / '..' / 'lib' / 'girepository-1.0',
)
# Verify the map file is correct -- note we can't actually use the generated
diff --git a/meson.build b/meson.build
index 38aa36b0..3fb7e579 100644
--- a/meson.build
+++ b/meson.build
@@ -521,7 +521,7 @@ if build_standalone
if host_machine.system() == 'windows'
plugin_dir = 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current)
else
- plugin_dir = join_paths(libdir, 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current))
+ plugin_dir = join_paths(bindir, '..', 'lib', 'fwupd-plugins-@0@'.format(libfwupdplugin_lt_current))
endif
conf.set_quoted('FWUPD_PLUGINDIR', plugin_dir)
endif