diff options
| author | Yuriy Taraday <yorik.sar@gmail.com> | 2018-05-31 00:33:42 +0400 |
|---|---|---|
| committer | Yuriy Taraday <yorik.sar@gmail.com> | 2018-05-31 00:33:42 +0400 |
| commit | e4810965c01db441d0347240ce4eff69d3556d0e (patch) | |
| tree | e5b10d309143bcb57ffcc0e7985ff7873f18bcc4 /pkgs/applications/networking/browsers/chromium | |
| parent | 88007f819d87c21a7be5e3c801f8f319f4515474 (diff) | |
| download | nixlib-e4810965c01db441d0347240ce4eff69d3556d0e.tar nixlib-e4810965c01db441d0347240ce4eff69d3556d0e.tar.gz nixlib-e4810965c01db441d0347240ce4eff69d3556d0e.tar.bz2 nixlib-e4810965c01db441d0347240ce4eff69d3556d0e.tar.lz nixlib-e4810965c01db441d0347240ce4eff69d3556d0e.tar.xz nixlib-e4810965c01db441d0347240ce4eff69d3556d0e.tar.zst nixlib-e4810965c01db441d0347240ce4eff69d3556d0e.zip | |
chromium: fix build for 67
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium')
3 files changed, 27 insertions, 0 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8ab141b5a337..a2d8a24ec5e6 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -143,6 +143,8 @@ 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 ] ++ optionals (versionAtLeast version "68") [ diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch new file mode 100644 index 000000000000..cc380a55abe0 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-freetype.patch @@ -0,0 +1,15 @@ +--- a/third_party/freetype/BUILD.gn ++++ b/third_party/freetype/BUILD.gn +@@ -63,10 +63,12 @@ source_set("freetype_source") { + "src/src/base/ftbase.c", + "src/src/base/ftbbox.c", + "src/src/base/ftbitmap.c", ++ "src/src/base/ftfntfmt.c", + "src/src/base/ftfstype.c", + "src/src/base/ftgasp.c", + "src/src/base/ftglyph.c", + "src/src/base/ftinit.c", ++ "src/src/base/ftlcdfil.c", + "src/src/base/ftmm.c", + "src/src/base/ftstroke.c", + "src/src/base/fttype1.c", diff --git a/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch b/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch new file mode 100644 index 000000000000..9d9ed6d2d052 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/fix-openh264.patch @@ -0,0 +1,10 @@ +--- a/third_party/openh264/BUILD.gn ++++ b/third_party/openh264/BUILD.gn +@@ -24,6 +24,7 @@ config("config") { + if (!is_win || is_clang) { + cflags += [ + "-Wno-format", ++ "-Wno-format-security", + "-Wno-header-hygiene", + "-Wno-unused-function", + "-Wno-unused-value", |