@@ -6,14 +6,16 @@
66, lib
77
88# package customization
9+# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)
910, channel ? "stable"
1011, gnomeSupport ? false, gnome ? null
1112, gnomeKeyringSupport ? false
1213, proprietaryCodecs ? true
1314, enablePepperFlash ? false
1415, enableWideVine ? false
16+, useVaapi ? false # Deprecated, use enableVaapi instead!
17+, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon
1518, ungoogled ? true
16−, useVaapi ? false # test video on radeon, before enabling this
1719, useOzone ? false
1820, cupsSupport ? true
1921, pulseSupport ? config.pulseaudio or stdenv.isLinux
@@ -21,7 +23,7 @@
2123}:
2224
2325let
24− llvmPackages = if channel == "dev"
26+ llvmPackages = if channel != "stable"
2527 then llvmPackages_10
2628 else llvmPackages_9;
2729 stdenv = llvmPackages.stdenv;
@@ -34,9 +36,10 @@ let
3436 upstream-info = (callPackage ./update.nix {}).getChannel channel;
3537
3638 mkChromiumDerivation = callPackage ./common.nix ({
37− inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone ungoogled;
39+ inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;
40+ inherit ungoogled;
3841 gnChromium = gn;
39− } // lib.optionalAttrs (channel == "dev") {
42+ } // lib.optionalAttrs (channel != "stable") {
4043 # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):
4144 gnChromium = gn.overrideAttrs (oldAttrs: {
4245 version = "2020-03-23";
@@ -130,6 +133,14 @@ let
130133 cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/
131134 ''
132135 else browser;
136+
137+ optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09:
138+ then throw ''
139+ Chromium's useVaapi was replaced by enableVaapi and you don't need to pass
140+ "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).
141+ '' else lib.optionalString
142+ (!enableVaapi)
143+ "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";
133144in stdenv.mkDerivation {
134145 name = "chromium${suffix}-${version}";
135146 inherit version;
@@ -149,15 +160,14 @@ in stdenv.mkDerivation {
149160 buildCommand = let
150161 browserBinary = "${chromiumWV}/libexec/chromium/chromium";
151162 getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
152− libPath = stdenv.lib.makeLibraryPath ([]
153− ++ stdenv.lib.optional useVaapi libva
154− );
163+ libPath = stdenv.lib.makeLibraryPath [ libva ];
155164
156165 in with stdenv.lib; ''
157166 mkdir -p "$out/bin"
158167
159168 eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
160169 --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \
170+ ${optionalVaapiFlags} \
161171 ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
162172
163173 ed -v -s "$out/bin/chromium" << EOF