diff options
| author | Yuriy Taraday <yorik.sar@gmail.com> | 2018-07-14 01:40:18 +0400 |
|---|---|---|
| committer | Yuriy Taraday <yorik.sar@gmail.com> | 2018-07-14 23:07:46 +0400 |
| commit | 06ec2a9f196be3b431b05bf955da32efcce71ce2 (patch) | |
| tree | 6e4b18cae4a6121cae7f09b65f456a2a2acdbf26 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | c283323c1e0ee783a85d92ddd1bd72bba2f835f6 (diff) | |
| download | nixlib-06ec2a9f196be3b431b05bf955da32efcce71ce2.tar nixlib-06ec2a9f196be3b431b05bf955da32efcce71ce2.tar.gz nixlib-06ec2a9f196be3b431b05bf955da32efcce71ce2.tar.bz2 nixlib-06ec2a9f196be3b431b05bf955da32efcce71ce2.tar.lz nixlib-06ec2a9f196be3b431b05bf955da32efcce71ce2.tar.xz nixlib-06ec2a9f196be3b431b05bf955da32efcce71ce2.tar.zst nixlib-06ec2a9f196be3b431b05bf955da32efcce71ce2.zip | |
chromium: fix 68 (beta) build
Also replace openh264 patch with one landed in upstream.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index dbfd47534164..021c048669f5 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -142,13 +142,18 @@ let # https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium # for updated patches and hints about build flags # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") - ./patches/fix-openh264.patch ./patches/fix-freetype.patch ] ++ optionals (versionRange "66" "68") [ ./patches/nix_plugin_paths_52.patch + (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") ] ++ optionals (versionAtLeast version "68") [ ./patches/nix_plugin_paths_68.patch + ] ++ optionals (versionRange "68" "69") [ + ./patches/remove-webp-include-68.patch + (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") + ] ++ optionals (versionAtLeast version "69") [ + ./patches/remove-webp-include-69.patch ] ++ optional enableWideVine ./patches/widevine.patch; postPatch = '' |