all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed

blob 80a0dfacafc3fa83274f54547e022c3792231eaf 955 bytes (raw)
name: gnu/packages/patches/gajim-plugins-os.patch 	 # note: path name is non-authoritative(*)

From c8e8d29243222e52bb30e123f2c7321a9f418995 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 19 Nov 2020 15:20:38 -0500
Subject: [PATCH 3/3] [PATCH]: Fix loading of OS-installed plugins.

---
 gajim/common/configpaths.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gajim/common/configpaths.py b/gajim/common/configpaths.py
index 0ac879314..f4418b020 100644
--- a/gajim/common/configpaths.py
+++ b/gajim/common/configpaths.py
@@ -47,7 +47,7 @@ def get_plugin_dirs() -> List[Path]:
         return [Path(_paths['PLUGINS_BASE']),
                 Path('/app/plugins')]
     return [Path(_paths['PLUGINS_BASE']),
-            Path(_paths['PLUGINS_USER'])]
+            Path(_paths['PLUGINS_USER'])] + ([Path(os.getenv('PLUGINS_OS'))] if os.getenv('PLUGINS_OS') and Path(os.getenv('PLUGINS_OS')).is_dir() else [])
 
 
 def get_paths(type_: PathType) -> Generator[Path, None, None]:
-- 
2.29.2

debug log:

solving 80a0dfacaf ...
found 80a0dfacaf in https://yhetil.org/guix/dba8fa42-86b1-a28b-2dc0-dc02ed6cacfd@raghavgururajan.name/

applying [1/1] https://yhetil.org/guix/dba8fa42-86b1-a28b-2dc0-dc02ed6cacfd@raghavgururajan.name/
diff --git a/gnu/packages/patches/gajim-plugins-os.patch b/gnu/packages/patches/gajim-plugins-os.patch
new file mode 100644
index 0000000000..80a0dfacaf

1:26: trailing whitespace.
 
1:27: trailing whitespace.
 
1:29: trailing whitespace.
-- 
Checking patch gnu/packages/patches/gajim-plugins-os.patch...
1:31: new blank line at EOF.
+
Applied patch gnu/packages/patches/gajim-plugins-os.patch cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 80a0dfacafc3fa83274f54547e022c3792231eaf	gnu/packages/patches/gajim-plugins-os.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.