mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-31 01:04:25 +00:00
chromium: fix build for 67
This commit is contained in:
parent
88007f819d
commit
e4810965c0
@ -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") [
|
||||
|
@ -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",
|
@ -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",
|
Loading…
Reference in New Issue
Block a user