commit 34643fcf96bfbc97189e405872a94a687660c4e4 · pyrox.dev/nixpkgs

+11 -6

pkgs/applications/networking/browsers/chromium/common.nix

···

       24
       24
        
       , libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone

     

       25
       25
        
       

     

       26
       26
        
       # package customization

     

       27
       27
       -
       , useVaapi ? false

     

       28
       27
        
       , useOzone ? false

     

       28
       28
       +
       , useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper

     

       29
       29
       +
       # VA-API TODOs:

     

       30
       30
       +
       # - Ozone: M81 fails to build due to "ozone_platform_gbm = false"

     

       31
       31
       +
       #   - Possible solutions: Write a patch to fix the build (wrong gn dependencies)

     

       32
       32
       +
       #     or build with minigbm

     

       33
       33
       +
       # - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879)

     

       29
       34
        
       , gnomeSupport ? false, gnome ? null

     

       30
       35
        
       , gnomeKeyringSupport ? false, libgnome-keyring3 ? null

     

       31
       36
        
       , proprietaryCodecs ? true

     
···

       127
       132
        
             libXScrnSaver libXcursor libXtst libGLU libGL

     

       128
       133
        
             pciutils protobuf speechd libXdamage at-spi2-core

     

       129
       134
        
             jre

     

       130
       130
       -
           ] ++ optional gnomeKeyringSupport libgnome-keyring3

     

       135
       135
       +
           ] ++ optional useVaapi libva

     

       136
       136
       +
             ++ optional gnomeKeyringSupport libgnome-keyring3

     

       131
       137
        
             ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]

     

       132
       138
        
             ++ optionals cupsSupport [ libgcrypt cups ]

     

       133
       133
       -
             ++ optional useVaapi libva

     

       134
       139
        
             ++ optional pulseSupport libpulseaudio

     

       135
       140
        
             ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ];

     

       136
       141
        
       

     
···

       149
       154
        
             #

     

       150
       155
        
             # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ]

     

       151
       156
        
             # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" )

     

       152
       152
       -
           ] ++ optionals (useVaapi) ([

     

       153
       153
       -
             # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi

     

       154
       154
       -
             ./patches/vaapi-fix.patch

     

       157
       157
       +
           ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build:

     

       158
       158
       +
             ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi

     

       159
       159
       +
             ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium)

     

       155
       160
        
           ] ++ optionals (versionRange "81" "82") [

     

       156
       161
        
             (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902")

     

       157
       162
        
             (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064")

+14 -5

pkgs/applications/networking/browsers/chromium/default.nix

···

       6
       6
        
       , lib

     

       7
       7
        
       

     

       8
       8
        
       # package customization

     

       9
       9
       +
       # Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper)

     

       9
       10
        
       , channel ? "stable"

     

       10
       11
        
       , gnomeSupport ? false, gnome ? null

     

       11
       12
        
       , gnomeKeyringSupport ? false

     

       12
       13
        
       , proprietaryCodecs ? true

     

       13
       14
        
       , enablePepperFlash ? false

     

       14
       15
        
       , enableWideVine ? false

     

       15
       15
       -
       , useVaapi ? false # test video on radeon, before enabling this

     

       16
       16
       +
       , useVaapi ? false # Deprecated, use enableVaapi instead!

     

       17
       17
       +
       , enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon

     

       16
       18
        
       , useOzone ? false

     

       17
       19
        
       , cupsSupport ? true

     

       18
       20
        
       , pulseSupport ? config.pulseaudio or stdenv.isLinux

     
···

       33
       35
        
           upstream-info = (callPackage ./update.nix {}).getChannel channel;

     

       34
       36
        
       

     

       35
       37
        
           mkChromiumDerivation = callPackage ./common.nix ({

     

       36
       36
       -
             inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone;

     

       38
       38
       +
             inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone;

     

       37
       39
        
             gnChromium = gn;

     

       38
       40
        
           } // lib.optionalAttrs (channel != "stable") {

     

       39
       41
        
             # TODO: Remove after we can update gn for the stable channel (backward incompatible changes):

     
···

       127
       129
        
               cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/

     

       128
       130
        
             ''

     

       129
       131
        
           else browser;

     

       132
       132
       +
       

     

       133
       133
       +
         optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09:

     

       134
       134
       +
           then throw ''

     

       135
       135
       +
             Chromium's useVaapi was replaced by enableVaapi and you don't need to pass

     

       136
       136
       +
             "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore).

     

       137
       137
       +
           '' else lib.optionalString

     

       138
       138
       +
             (!enableVaapi)

     

       139
       139
       +
             "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode";

     

       130
       140
        
       in stdenv.mkDerivation {

     

       131
       141
        
         name = "chromium${suffix}-${version}";

     

       132
       142
        
         inherit version;

     
···

       146
       156
        
         buildCommand = let

     

       147
       157
        
           browserBinary = "${chromiumWV}/libexec/chromium/chromium";

     

       148
       158
        
           getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";

     

       149
       149
       -
           libPath = stdenv.lib.makeLibraryPath ([]

     

       150
       150
       -
             ++ stdenv.lib.optional useVaapi libva

     

       151
       151
       -
           );

     

       159
       159
       +
           libPath = stdenv.lib.makeLibraryPath [ libva ];

     

       152
       160
        
       

     

       153
       161
        
         in with stdenv.lib; ''

     

       154
       162
        
           mkdir -p "$out/bin"

     

       155
       163
        
       

     

       156
       164
        
           eval makeWrapper "${browserBinary}" "$out/bin/chromium" \

     

       157
       165
        
             --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \

     

       166
       166
       +
             ${optionalVaapiFlags} \

     

       158
       167
        
             ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}

     

       159
       168
        
       

     

       160
       169
        
           ed -v -s "$out/bin/chromium" << EOF

+48

pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch

···

       1
       1
       +
       From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Michael Weiss <dev.primeos@gmail.com>

     

       3
       3
       +
       Date: Tue, 14 Apr 2020 14:16:10 +0200

     

       4
       4
       +
       Subject: [PATCH] Enable accelerated video decode on Linux

     

       5
       5
       +
       

     

       6
       6
       +
       This will enable accelerated video decode on Linux by default (i.e.

     

       7
       7
       +
       without "--ignore-gpu-blacklist"), but on NixOS we'll provide

     

       8
       8
       +
       "--disable-accelerated-video-decode" and

     

       9
       9
       +
       "--disable-accelerated-video-encode" by default to avoid regressions

     

       10
       10
       +
       (e.g. VA-API doesn't work properly for some radeon drivers).

     

       11
       11
       +
       

     

       12
       12
       +
       Video acceleration can then be enabled via:

     

       13
       13
       +
       chromium.override { enableVaapi = true; }

     

       14
       14
       +
       without rebuilding Chromium.

     

       15
       15
       +
       ---

     

       16
       16
       +
        gpu/config/software_rendering_list.json | 16 ----------------

     

       17
       17
       +
        1 file changed, 16 deletions(-)

     

       18
       18
       +
       

     

       19
       19
       +
       diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json

     

       20
       20
       +
       index 22712bdbf38f..a06dd19a50e4 100644

     

       21
       21
       +
       --- a/gpu/config/software_rendering_list.json

     

       22
       22
       +
       +++ b/gpu/config/software_rendering_list.json

     

       23
       23
       +
       @@ -336,22 +336,6 @@

     

       24
       24
       +
              ]

     

       25
       25
       +
            },

     

       26
       26
       +
            {

     

       27
       27
       +
       -      "id": 48,

     

       28
       28
       +
       -      "description": "Accelerated video decode is unavailable on Linux",

     

       29
       29
       +
       -      "cr_bugs": [137247, 1032907],

     

       30
       30
       +
       -      "os": {

     

       31
       31
       +
       -        "type": "linux"

     

       32
       32
       +
       -      },

     

       33
       33
       +
       -      "exceptions": [

     

       34
       34
       +
       -        {

     

       35
       35
       +
       -          "machine_model_name": ["Chromecast"]

     

       36
       36
       +
       -        }

     

       37
       37
       +
       -      ],

     

       38
       38
       +
       -      "features": [

     

       39
       39
       +
       -        "accelerated_video_decode"

     

       40
       40
       +
       -      ]

     

       41
       41
       +
       -    },

     

       42
       42
       +
       -    {

     

       43
       43
       +
              "id": 50,

     

       44
       44
       +
              "description": "Disable VMware software renderer on older Mesa",

     

       45
       45
       +
              "cr_bugs": [145531, 332596, 571899, 629434],

     

       46
       46
       +
       -- 

     

       47
       47
       +
       2.11.0

     

       48
       48
       +

pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch