unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
blob 5ef9c56b522397e795d8a5966811f9ce269f8828 942 bytes (raw)
name: gnu/packages/patches/ungoogled-chromium-search-path.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
 
Look for system-installed extensions in CHROMIUM_EXTENSION_DIRECTORY instead
of the hard-coded /usr/share/chromium/extensions.

--- a/chrome/common/chrome_paths.cc
+++ b/chrome/common/chrome_paths.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/common/chrome_paths.h"
 
+#include "base/environment.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/native_library.h"
@@ -511,7 +512,13 @@
 #endif
 #if defined(OS_LINUX) || defined(OS_CHROMEOS)
     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
-      cur = base::FilePath(kFilepathSinglePrefExtensions);
+      std::unique_ptr<base::Environment> environment(base::Environment::Create());
+      std::string extension_dir;
+      if (environment->GetVar("CHROMIUM_EXTENSION_DIRECTORY", &extension_dir)) {
+        cur = base::FilePath(extension_dir);
+      } else {
+        cur = base::FilePath(kFilepathSinglePrefExtensions);
+      }
       break;
     }
 #endif

debug log:

solving 5ef9c56b52 ...
found 5ef9c56b52 in https://yhetil.org/guix-patches/20201030183232.5497-1-marius@gnu.org/ ||
	https://yhetil.org/guix-patches/20201102002228.5971-2-marius@gnu.org/

applying [1/1] https://yhetil.org/guix-patches/20201030183232.5497-1-marius@gnu.org/
diff --git a/gnu/packages/patches/ungoogled-chromium-search-path.patch b/gnu/packages/patches/ungoogled-chromium-search-path.patch
new file mode 100644
index 0000000000..5ef9c56b52

1:13: trailing whitespace.
 
1:15: trailing whitespace.
 
Checking patch gnu/packages/patches/ungoogled-chromium-search-path.patch...
Applied patch gnu/packages/patches/ungoogled-chromium-search-path.patch cleanly.
warning: 2 lines add whitespace errors.

skipping https://yhetil.org/guix-patches/20201102002228.5971-2-marius@gnu.org/ for 5ef9c56b52
index at:
100644 5ef9c56b522397e795d8a5966811f9ce269f8828	gnu/packages/patches/ungoogled-chromium-search-path.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 public inbox

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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).