pkgs/development/libraries/gsignond/plugin-load-env.patch at netboot-syslinux-multiplatform · tjh.dev/nixpkgs

tjh.dev / nixpkgs

Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

nixpkgs / pkgs / development / libraries / gsignond / plugin-load-env.patch

at netboot-syslinux-multiplatform 1.1 kB view raw

 1diff --git a/src/gplugind/gsignond-plugin-loader.c b/src/gplugind/gsignond-plugin-loader.c
 2index 5497b32..979e1b4 100644
 3--- a/src/gplugind/gsignond-plugin-loader.c
 4+++ b/src/gplugind/gsignond-plugin-loader.c
 5@@ -38,11 +38,10 @@ gsignond_load_plugin (
 6     gchar *plugin_filename;
 7     GSignondPlugin *plugin;
 8 
 9-#   ifdef ENABLE_DEBUG
10     const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
11     if (env_val)
12         plugin_path = env_val;
13-#   endif
14+
15     plugin_filename = g_module_build_path (plugin_path, plugin_type);
16     plugin = gsignond_load_plugin_with_filename (plugin_type,
17                                                  plugin_filename);
18diff --git a/src/gplugind/main.c b/src/gplugind/main.c
19index 1c6cdb6..c85c623 100644
20--- a/src/gplugind/main.c
21+++ b/src/gplugind/main.c
22@@ -93,11 +93,11 @@ _install_sighandlers (GMainLoop *main_loop)
23 static const gchar* _plugin_path(void)
24 {
25     const gchar *plugin_path = GSIGNOND_GPLUGINS_DIR;
26-#   ifdef ENABLE_DEBUG
27+
28     const gchar *env_val = g_getenv("SSO_GPLUGINS_DIR");
29     if (env_val)
30         plugin_path = env_val;
31-#   endif
32+
33     return plugin_path;
34 }
35