diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-06-11 19:36:28 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-06-11 19:54:11 +0200 |
commit | af54ddf8b635e2897db64d775317e33a42c259e2 (patch) | |
tree | 9ea48cc8c66d97b35d854de0206d9be3018f4294 /pkgs/applications/networking/browsers/chromium/source | |
parent | 6a8afa4bb35ee9cffb8e62f5a294adc781b9d348 (diff) | |
download | nixpkgs-af54ddf8b635e2897db64d775317e33a42c259e2.tar nixpkgs-af54ddf8b635e2897db64d775317e33a42c259e2.tar.gz nixpkgs-af54ddf8b635e2897db64d775317e33a42c259e2.tar.bz2 nixpkgs-af54ddf8b635e2897db64d775317e33a42c259e2.tar.lz nixpkgs-af54ddf8b635e2897db64d775317e33a42c259e2.tar.xz nixpkgs-af54ddf8b635e2897db64d775317e33a42c259e2.tar.zst nixpkgs-af54ddf8b635e2897db64d775317e33a42c259e2.zip |
chromium: Drop plugin_paths patch for old versions.
The patch was for versions prior to version 22, so we no longer need it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/source')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch deleted file mode 100644 index 0220d042941..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index 8a205a6..d5c24e1 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -97,21 +97,14 @@ static base::LazyInstance<base::FilePath> - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) && !defined(OS_IOS) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - } // namespace -@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(FILE_PATH_LITERAL("script.log")); - break; - case chrome::FILE_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) - return false; - cur = cur.Append(kInternalFlashPluginFileName); - break; -@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.Append(chrome::kPepperFlashPluginFilename); - break; - case chrome::FILE_PDF_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PDF")) - return false; - cur = cur.Append(kInternalPDFPluginFileName); - break; - case chrome::FILE_EFFECTS_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) - return false; - cur = cur.Append(kEffectsPluginFileName); - break; -@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { - // We currently need a path here to look up whether the plugin is disabled - // and what its permissions are. - case chrome::FILE_NACL_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "NACL")) - return false; - cur = cur.Append(kInternalNaClPluginFileName); - break; -@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); -@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { - // In the component case, this is the source adapter. Otherwise, it is the - // actual Pepper module that gets loaded. - case chrome::FILE_WIDEVINE_CDM_ADAPTER: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) - return false; - cur = cur.AppendASCII(kWidevineCdmAdapterFileName); - break; |