about summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-08-26 13:32:35 +0200
committerMichael Weiss <dev.primeos@gmail.com>2020-08-26 14:30:49 +0200
commit2213c464f6f7ce28078b829afda30cb007ff713a (patch)
tree713064aee80aa069c73b25e494457860bfbf5176 /pkgs/applications/networking/browsers
parent4a8262149139a9dee25a63a2d2c2888ede7d73dd (diff)
chromiumDev: Drop nix_plugin_paths_68.patch
Ok, so I was about to update the patch (didn't apply anymore) when I
also started looking at it's usage and realized that
NIX_CHROMIUM_PLUGIN_PATH_ (and other substrings) only appears in the
patch itself (i.e. it seemed like we don't need this patch anymore).

Turns out that we have this patch since 2014 (1b84fbf0cac) and it was
only ever used for NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE (and from the log
it isn't clear if/when or how well that worked). But in 2019 that last
usage got removed (545d58a1ef8) so we should be able to safely drop this
patch now :) \o/

(I just wanted to note that as it seemed somewhat of a funny story :D
But there is of course nothing wrong with it.)
Git history (git log --oneline -S NIX_CHROMIUM_PLUGIN_PATH_):
7205bd64a38d73ff8c46a5bb9d4732da1a26ac02 ungoogled-chromium: init at 81.0.4044.92-2
545d58a1ef8abb5a493654a84b9d6a3ca87a7909 chromium: fix widevine
cd3283f9218b70fdf39640ba1be6fa16e137c209 chromium: 67.0.3396.99 -> 68.0.3440.75
72d7b5ddb14a8b5903f01c7b40f216a0a6149fb8 chromium: fix nix_plugin_paths for 68+
7a3a16dd8040e7ba675b50ca47d023ee61f087d3 chromium: Remove plugin paths patch for version 50
79d18eb6045b33e081fbce4b66374ea75dfeeb5f chromium: Update dev channel to v52.0.2743.10
c7a3645e7bfe8bd6db7d3d9a320c2f07ea582347 chromium: Remove stuff for versions <= v51
8b97ca270e84c38bb0fb1da829da318ed7dbda8a chromium: Update all channels to latest versions
b9093f1c641846882fdced70269a4ee09c2c376b chromium: Updates, fixes #11492
471cdd15e2dd6ac1c20aa18e177e590d67de2c44 chromium: Update beta and dev channels.
5c6aa391fc480898fa80b34df4037e4ee8b2d8a6 chromium: Cleanup old patch and update stable
af54ddf8b635e2897db64d775317e33a42c259e2 chromium: Drop plugin_paths patch for old versions.
6a8afa4bb35ee9cffb8e62f5a294adc781b9d348 chromium: Fix plugin_paths patch for version 44.
0aad4b7ee418a5a4a6aa0c2da8a590480a63562a chromium: Update all channels to latest versions.
1b84fbf0cacaa3999979602919c3ee8df7ae9c6d chromium: Allow env vars for passing plugin paths.
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/chromium/common.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e538fb66bf9d9..45d5fc9e3f27d 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -144,8 +144,9 @@ let
       ++ optional pulseSupport libpulseaudio
       ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];
 
-    patches = [
+    patches = optionals (versionRange "68" "86") [
       ./patches/nix_plugin_paths_68.patch
+    ] ++ [
       ./patches/remove-webp-include-69.patch
       ./patches/no-build-timestamps.patch
       ./patches/widevine-79.patch