nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-18 19:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

chromium: 62.0.3202.62 -> 62.0.3202.75

Browse Source 
also fix beta/dev build - use harfbuzz from sources

Unfortunatelly after [0] chromium doesn't support using harfbuzz provided by
system while using vendored version of freetype.
Disabling usage of separate harfbuzz for now.

[0] https://chromium-review.googlesource.com/c/chromium/src/+/696241
This commit is contained in:
Yuriy Taraday 2017-10-22 23:36:30 +04:00 committed by Herwig Hochleitner
parent b2f199404f
commit da3c404e58
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -60,10 +60,13 @@ let
in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs));
gnSystemLibraries = [
"flac" "harfbuzz-ng" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
"flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" "zlib"
# "libjpeg" # fails with multiple undefined references to chromium_jpeg_*
# "re2" # fails with linker errors
# "ffmpeg" # https://crbug.com/731766
] ++ optionals (versionRange "62" "63") [
"harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
];
opusWithCustomModes = libopus.override {
@ -76,7 +79,10 @@ let
libpng libcap
xdg_utils yasm minizip libwebp
libusb1 re2 zlib
ffmpeg harfbuzz-icu libxslt libxml2
ffmpeg libxslt libxml2
] ++ optionals (versionRange "62" "63") [
harfbuzz-icu # in versions over 63 harfbuzz and freetype are being built together
# so we can't build with one from system and other from source
];
# build paths and release info

18
pkgs/applications/networking/browsers/chromium/upstream-info.nix
View File

@ -1,18 +1,18 @@
# This file is autogenerated from update.sh in the same directory.
{
beta = {
sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8";
sha256bin64 = "10d1v9sa0wnnhjz6ria315aml20v1jl2bnkhcqi125rqk5fw9wrq";
version = "62.0.3202.62";
sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
sha256bin64 = "1ca9p82k7a9h416vwldzy84ww5psv3kbvh5xdys3j3cwaxxa0b4q";
version = "63.0.3239.18";
};
dev = {
sha256 = "0dx9n9j1apngs4gc1n0kyccczm58045l342jr06azaw5yamsk8xb";
sha256bin64 = "1syqi1fx3kkn7865m6ldicg9cxcg1pfy9l1fr2k5mcqxsdblcyyv";
version = "63.0.3239.9";
sha256 = "1ljpr7xkbg6hznpq9kph5xvrc6dwnp7y9ydirjawqvyhcmy6b8zj";
sha256bin64 = "1hq3qz7b5nmnck5sfbaa8d25khv88ylnq10dhbp76ahz4ixn9f7k";
version = "63.0.3239.18";
};
stable = {
sha256 = "0qn3pjq5n3ri3qh25wg5gd2as5a8wlkncqvi975xsab771833pz8";
sha256bin64 = "1ijpv76wbxgwcvgr3nd9ciyyf26z56gxw4caga4x6600pa2lm8wq";
version = "62.0.3202.62";
sha256 = "0k4hvmhaspw3f2scjjcam9dwnkrrzzibnx9sq5b1p56bgd2zxka9";
sha256bin64 = "0c4g2h1kcpksx0whf784hs7w62xbgsvq42fvzs0lfjgs11s8fm0x";
version = "62.0.3202.75";
};
}