diff options
author | Cole Mickens <cole.mickens@gmail.com> | 2019-02-18 00:17:05 -0800 |
---|---|---|
committer | Herwig Hochleitner <herwig@bendlas.net> | 2019-03-25 02:02:05 +0100 |
commit | 60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b (patch) | |
tree | 0798340ff5726009a09928f4bcde68704fc6a12f /pkgs/applications/networking/browsers/chromium/common.nix | |
parent | 5a9eaf02ae3c6403ce6f23d33ae569be3f9ce644 (diff) | |
download | nixlib-60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b.tar nixlib-60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b.tar.gz nixlib-60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b.tar.bz2 nixlib-60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b.tar.lz nixlib-60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b.tar.xz nixlib-60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b.tar.zst nixlib-60e2d2ce2bd8c36c6e6f5152bea2d78ebab58f8b.zip |
chromium: enable mojo + vaapi + allow hw accel
fixes https://github.com/NixOS/nixpkgs/pull/57837 closes https://github.com/NixOS/nixpkgs/pull/56973
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 36576df4b732..04713afe6107 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -20,10 +20,12 @@ # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport +, libva ? null # useVaapi # package customization , enableNaCl ? false , enableWideVine ? false +, useVaapi ? true , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -126,6 +128,7 @@ let ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optional (versionAtLeast version "72") jdk.jre; @@ -143,6 +146,9 @@ let # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits # # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (useVaapi) [ + # source: https://aur.archlinux.org/cgit/aur.git/plain/chromium-vaapi.patch?h=chromium-vaapi + ./patches/chromium-vaapi.patch ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [ ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" ) ] ++ optional stdenv.isAarch64 @@ -260,6 +266,8 @@ let proprietary_codecs = true; enable_hangout_services_extension = true; ffmpeg_branding = "Chrome"; + } // optionalAttrs useVaapi { + use_vaapi = true; } // optionalAttrs pulseSupport { use_pulseaudio = true; link_pulseaudio = true; |