summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers/chromium/default.nix
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2021-02-06 14:41:26 +0100
committerMichael Weiss <dev.primeos@gmail.com>2021-02-07 12:27:36 +0100
commitd55603f11d36ae38ca76dec8d95bc55d2115f104 (patch)
tree2d86b73aa357478e98fb4a86c7389feefa0a97f6 /pkgs/applications/networking/browsers/chromium/default.nix
parentd7f6cb105704068eae49a048a11030f849fdf44a (diff)
downloadnixpkgs-d55603f11d36ae38ca76dec8d95bc55d2115f104.tar
nixpkgs-d55603f11d36ae38ca76dec8d95bc55d2115f104.tar.gz
nixpkgs-d55603f11d36ae38ca76dec8d95bc55d2115f104.tar.bz2
nixpkgs-d55603f11d36ae38ca76dec8d95bc55d2115f104.tar.lz
nixpkgs-d55603f11d36ae38ca76dec8d95bc55d2115f104.tar.xz
nixpkgs-d55603f11d36ae38ca76dec8d95bc55d2115f104.tar.zst
nixpkgs-d55603f11d36ae38ca76dec8d95bc55d2115f104.zip
chromium: Remove the Adobe Flash Player plugin support
The Flash support was completely removed in Chromium M88:
- https://www.chromium.org/flash-roadmap#TOC-Flash-Support-Removed-from-Chromium-Target:-Chrome-88---Jan-2021-
- https://chromestatus.com/feature/5643527180517376

See #110314.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
-rw-r--r--pkgs/applications/networking/browsers/chromium/default.nix9
1 files changed, 1 insertions, 8 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 900e823bb75..79899d822b0 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -12,7 +12,6 @@
 , gnomeSupport ? false, gnome ? null
 , gnomeKeyringSupport ? false
 , proprietaryCodecs ? true
-, enablePepperFlash ? false
 , enableWideVine ? false
 , enableVaapi ? false # Disabled by default due to unofficial support
 , ungoogled ? false # Whether to build chromium or ungoogled-chromium
@@ -45,10 +44,6 @@ let
 
     browser = callPackage ./browser.nix { inherit channel enableWideVine ungoogled; };
 
-    plugins = callPackage ./plugins.nix {
-      inherit enablePepperFlash;
-    };
-
     ungoogled-chromium = callPackage ./ungoogled.nix {};
   };
 
@@ -166,7 +161,6 @@ in stdenv.mkDerivation {
 
   buildCommand = let
     browserBinary = "${chromiumWV}/libexec/chromium/chromium";
-    getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
     libPath = lib.makeLibraryPath [ libva pipewire_0_2 ];
 
   in with lib; ''
@@ -174,8 +168,7 @@ in stdenv.mkDerivation {
 
     eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
       --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
-      ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \
-      ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
+      ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"}
 
     ed -v -s "$out/bin/chromium" << EOF
     2i