diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-07-28 05:05:01 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-07-28 15:58:14 +0200 |
commit | 4a108847afb177305edb8375dbd3908c99369599 (patch) | |
tree | 5ffd7681a7f672845e1b8c6506b135a3b42839fb /pkgs/applications/networking/browsers/chromium/common.nix | |
parent | 760d5796520d5713e753d1212d01b4ea9e5fdb39 (diff) | |
download | nixpkgs-4a108847afb177305edb8375dbd3908c99369599.tar nixpkgs-4a108847afb177305edb8375dbd3908c99369599.tar.gz nixpkgs-4a108847afb177305edb8375dbd3908c99369599.tar.bz2 nixpkgs-4a108847afb177305edb8375dbd3908c99369599.tar.lz nixpkgs-4a108847afb177305edb8375dbd3908c99369599.tar.xz nixpkgs-4a108847afb177305edb8375dbd3908c99369599.tar.zst nixpkgs-4a108847afb177305edb8375dbd3908c99369599.zip |
chromium: Update all channels to latest versions.
With this commit, the following new upstream versions are introduced: stable: 35.0.1916.153 -> 36.0.1985.125 beta: 36.0.1985.84 -> 37.0.2062.44 dev: 37.0.2054.3 -> 38.0.2101.0 All builds were successfully tested on my machine, however in order to update the beta and dev channels, a few additional modifications were necessary: * Don't update address_input_strings.grdp anymore because this has been done/fixed upstream and was relevant in version 37.0.2054.3 _only_. * No need to fix references to /usr/bin/gcc in version 38 anymore. * Constrain patch for Angle (introduced in 4cbedd7) to version 37 only, because it already has been applied upstream in version 38. * Drop user namespaces patch for version 31 up until version 35, because version 36 is already in stable. * Don't try to build bundled Clang and/or even build using Clang. * Remove obsolete patchPhase commands that are specific to version 35 and older. While testing the dev version 38 I came accross a font rendering issue which needs to be addressed ASAP (perhaps related to #3187), however the browser works otherwise. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
-rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3aac5f9b17a..31125795271 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -79,7 +79,7 @@ let }; opusWithCustomModes = libopus.override { - withCustomModes = !versionOlder source.version "35.0.0.0"; + withCustomModes = true; }; defaultDependencies = [ @@ -132,19 +132,13 @@ let find -iname '*.gyp*' \( -type f -o -type l \) \ -exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \ -exec chmod u+w {} + - '' + optionalString (!versionOlder source.version "37.0.0.0") '' - python third_party/libaddressinput/chromium/tools/update-strings.py ''; - postPatch = let - toPatch = if versionOlder source.version "36.0.0.0" - then "content/browser/browser_main_loop.cc" - else "sandbox/linux/suid/client/setuid_sandbox_client.cc"; - in '' + postPatch = '' sed -i -e '/base::FilePath exe_dir/,/^ *} *$/c \ sandbox_binary = base::FilePath(getenv("CHROMIUM_SANDBOX_BINARY_PATH")); - ' ${toPatch} - '' + optionalString (!versionOlder source.version "36.0.0.0") '' + ' sandbox/linux/suid/client/setuid_sandbox_client.cc + sed -i -e '/module_path *=.*libexif.so/ { s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")| }' chrome/utility/media_galleries/image_metadata_extractor.cc @@ -165,6 +159,7 @@ let use_cups = cupsSupport; linux_sandbox_chrome_path="${libExecPath}/${packageName}"; werror = ""; + clang = false; # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. use_mojo = versionOlder source.version "37.0.0.0"; |