4 files changed, 16 insertions, 49 deletions
diff --git a/src/backend/plugins/config-osx/config-osx.c b/src/backend/plugins/config-osx/config-osx.c
index 8a9e6e4..16813a0 100644
--- a/src/backend/plugins/config-osx/config-osx.c
+++ b/src/backend/plugins/config-osx/config-osx.c
@@ -19,16 +19,20 @@
  * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
-#include <libpeas/peas.h>
 #include <SystemConfiguration/SystemConfiguration.h>
 
+#include <gio/gio.h>
+
 #include "config-osx.h"
 
 #include "px-plugin-config.h"
 #include "px-manager.h"
 
 static void px_config_iface_init (PxConfigInterface *iface);
-G_MODULE_EXPORT void peas_register_types (PeasObjectModule *module);
+
+struct _PxConfigOsX {
+  GObject parent_instance;
+};
 
 G_DEFINE_FINAL_TYPE_WITH_CODE (PxConfigOsX,
                                px_config_osx,
@@ -330,14 +334,8 @@ px_config_osx_get_config (PxConfig     *self,
 static void
 px_config_iface_init (PxConfigInterface *iface)
 {
+  iface->name = "config-osx";
+  iface->priority = PX_CONFIG_PRIORITY_DEFAULT;
   iface->is_available = px_config_osx_is_available;
   iface->get_config = px_config_osx_get_config;
 }
-
-G_MODULE_EXPORT void
-peas_register_types (PeasObjectModule *module)
-{
-  peas_object_module_register_extension_type (module,
-                                              PX_TYPE_CONFIG,
-                                              PX_CONFIG_TYPE_OSX);
-}
diff --git a/src/backend/plugins/config-osx/config-osx.h b/src/backend/plugins/config-osx/config-osx.h
index 544329f..797b51e 100644
--- a/src/backend/plugins/config-osx/config-osx.h
+++ b/src/backend/plugins/config-osx/config-osx.h
@@ -22,7 +22,6 @@
 #pragma once
 
 #include <glib.h>
-#include <libpeas/peas.h>
 
 G_BEGIN_DECLS
 
@@ -30,10 +29,6 @@ G_BEGIN_DECLS
 
 G_DECLARE_FINAL_TYPE (PxConfigOsX, px_config_osx, PX, CONFIG_OSX, GObject)
 
-struct _PxConfigOsX {
-  GObject parent_instance;
-};
-
 G_END_DECLS
 
 
diff --git a/src/backend/plugins/config-osx/config-osx.plugin b/src/backend/plugins/config-osx/config-osx.plugin
deleted file mode 100644
index 61c4a2a..0000000
--- a/src/backend/plugins/config-osx/config-osx.plugin
+++ /dev/null
@@ -1,3 +0,0 @@
-[Plugin]
-Module=config-osx
-Name=OS X
-\ No newline at end of file
diff --git a/src/backend/plugins/config-osx/meson.build b/src/backend/plugins/config-osx/meson.build
index eac98e8..f801d90 100644
--- a/src/backend/plugins/config-osx/meson.build
+++ b/src/backend/plugins/config-osx/meson.build
@@ -1,39 +1,16 @@
 plugin_name = 'config-osx'
 
-if host_machine.system() == 'darwin'
+if get_option(plugin_name) and with_platform_darwin
 
-if get_option(plugin_name)
-
-plugin_src = [
-  '@0@.c'.format(plugin_name),
+foundation_dep = dependency('Foundation')
+system_configuration_dep = dependency('SystemConfiguration')
+px_backend_deps += [
+  foundation_dep,
+  system_configuration_dep,
 ]
 
-plugin_data = [
-  '@0@.plugin'.format(plugin_name),
+px_backend_sources += [
+  'plugins/@0@/@0@.c'.format(plugin_name),
 ]
 
-plugin_lib = shared_module(
-  plugin_name,
-  plugin_src,
-  include_directories: px_backend_inc,
-  c_args: px_backend_c_args,
-  dependencies: [px_backend_dep],
-  install_dir: join_paths(px_plugins_dir, plugin_name),
-  install: true,
-  name_suffix: module_suffix
-)
-
-# Starting with Meson 0.64 this can be replaced with fs.copyfile
-custom_target(
-  '@0@-data'.format(plugin_name),
-  input: plugin_data,
-  output: plugin_data,
-  command: ['cp', '@INPUT@', '@OUTDIR@'],
-  build_by_default: true,
-  install_dir: join_paths(px_plugins_dir, plugin_name),
-  install: true,
-)
-
-endif
-
 endif