Merge branch 'chromium-update'.

This also merges pull request #8290 plus a few other fixes from
@ambrop72 and me.

The summary of changes is:

  * Update all channels to latest upstream.
  * Update GYP package and drop gyp_svn1977.
  * Remove ICU from buildInputs to prevent build failure.
  * Switch back to using --depth . to GYP instead of patching in the
    absolute store paths.
  * Don't symlink source code anymore, which might introduce a
    regression on high I/O load on Hydra. As this is only a temporary
    build fix, let's cross fingers and hope we don't hit it. See
    c92dbffeac for an explanation.
  * Use HTTPS for the bucket URL.
  * Fix nix_plugin_paths patch for version 44 and higher.

Tested at: https://headcounter.org/hydra/eval/169134
This commit is contained in:
aszlig 2015-06-12 06:05:08 +02:00
commit 1746140184
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
6 changed files with 28 additions and 71 deletions

View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, ninja, which
# default dependencies
, bzip2, flac, speex, icu, libopus
, bzip2, flac, speex, libopus
, libevent, expat, libjpeg, snappy
, libpng, libxml2, libxslt, libcap
, xdg_utils, yasm, minizip, libwebp
@ -84,7 +84,7 @@ let
};
defaultDependencies = [
bzip2 flac speex icu opusWithCustomModes
bzip2 flac speex opusWithCustomModes
libevent expat libjpeg snappy
libpng libxml2 libxslt libcap
xdg_utils yasm minizip libwebp
@ -113,7 +113,7 @@ let
glib gtk dbus_glib
libXScrnSaver libXcursor libXtst mesa
pciutils protobuf speechd libXdamage
pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2
pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2
] ++ optional gnomeKeyringSupport libgnome_keyring3
++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
++ optional enableSELinux libselinux
@ -124,15 +124,10 @@ let
# be fixed, then try again to unbundle everything into separate
# derivations.
prePatch = ''
cp -dsr --no-preserve=mode "${source.main}"/* .
cp -dsr --no-preserve=mode "${source.sandbox}" sandbox
cp -dr --no-preserve=mode "${source.main}"/* .
cp -dr --no-preserve=mode "${source.sandbox}" sandbox
cp -dr "${source.bundled}" third_party
chmod -R u+w third_party
# Hardcode source tree root in all gyp files
find -iname '*.gyp*' \( -type f -o -type l \) \
-exec sed -i -e 's|<(DEPTH)|'"$(pwd)"'|g' {} + \
-exec chmod u+w {} +
'';
postPatch = optionalString (versionOlder version "42.0.0.0") ''
@ -200,7 +195,7 @@ let
# This is to ensure expansion of $out.
libExecPath="${libExecPath}"
python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
python build/gyp_chromium -f ninja --depth . ${gypFlags}
'';
buildPhase = let

View file

@ -18,7 +18,7 @@ let
"s,^/,,"
]);
pre42 = versionOlder version "42.0.0.0";
pre44 = versionOlder version "44.0.0.0";
in stdenv.mkDerivation {
name = "chromium-source-${version}";
@ -47,10 +47,10 @@ in stdenv.mkDerivation {
done
'';
patches = if pre42 then [
./sandbox_userns_36.patch ./nix_plugin_paths.patch
] else [
patches = if pre44 then [
./nix_plugin_paths_42.patch
] else [
./nix_plugin_paths_44.patch
];
patchPhase = let
@ -73,11 +73,10 @@ in stdenv.mkDerivation {
-e 's|/bin/echo|echo|' \
-e "/python_arch/s/: *'[^']*'/: '""'/" \
"$out/build/common.gypi" "$main/chrome/chrome_tests.gypi"
'' + optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
'' + optionalString (!pre42) ''
sed -i -e '/LOG.*no_suid_error/d' \
"$main/content/browser/browser_main_loop.cc"
'' + optionalString useOpenSSL ''
cat $opensslPatches | patch -p1 -d "$bundled/openssl/openssl"
'';
preferLocalBuild = true;

View file

@ -55,21 +55,6 @@ index 8a205a6..d5c24e1 100644
return false;
cur = cur.Append(kInternalFlashPluginFileName);
break;
@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.Append(chrome::kPepperFlashPluginFilename);
break;
case chrome::FILE_PDF_PLUGIN:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "PDF"))
return false;
cur = cur.Append(kInternalPDFPluginFileName);
break;
case chrome::FILE_EFFECTS_PLUGIN:
- if (!GetInternalPluginsDirectory(&cur))
+ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS"))
return false;
cur = cur.Append(kEffectsPluginFileName);
break;
@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) {
// We currently need a path here to look up whether the plugin is disabled
// and what its permissions are.

View file

@ -1,21 +1,21 @@
# This file is autogenerated from update.sh in the parent directory.
{
dev = {
version = "43.0.2327.5";
sha256 = "0k9jpzm1n7d3zv6f77vz33jcvmnbxnl6plabvlrf8w83kbzhi76n";
sha256bin32 = "1dm4xp0x02kqj82giw45qd2z12wf22h2bs0d3hnlz050innxgcb6";
sha256bin64 = "1b13g44y704llsnw68840zmaahj1hwzram50v8fqmff44w1b0bxb";
version = "45.0.2421.0";
sha256 = "1qc80y0mhwnvxrvpc3csskgb536wq34c0fgk19h1qb4xc62lxhsk";
sha256bin32 = "1xqhyrlmh00md6i1q4wr0xihqbvcpshzscnjclrn53dlw5zs2s89";
sha256bin64 = "0akdhwwdfcbqfh65a82zigbhsi8sbhhw6904cjprb3bmv4l3c598";
};
beta = {
version = "42.0.2311.39";
sha256 = "0qiyg8bg9f1daf8v2jlrv54lis7156h44ak42jdx96xanvj2rvj0";
sha256bin32 = "0v4dr2a3n51dais2mg0dml0rmqfmalfj0zgp20a4kkarbpih1x0v";
sha256bin64 = "19638ik9qgfmxpzdry0qwkwpzvhlbs2h2nn1kwsjja5j49817ksx";
version = "44.0.2403.39";
sha256 = "15c4adg0r9ym3pxya7vv4d148gv2pdwaaymxvvw511fjwffdv71n";
sha256bin32 = "1gaypkah10y31gb5f7vnyv0v73z5zjznmsp6vh2m4hfajx7s55jn";
sha256bin64 = "1j1ma6asl3ibjv3apyw24vhyi1qy64f586w8jizqzp4h962gj95c";
};
stable = {
version = "41.0.2272.89";
sha256 = "1saxcyqp8pz496qwdgl4dqxll6l9icbljm56w1rrkxgwrrvl4iwk";
sha256bin32 = "19srg0isp1k4fwixwjxm1j88bnqx9sb349n992i038c3h8raa1v4";
sha256bin64 = "1fb8ffgbsjsij7bd1qawa03z9pybasfig1cmdzwybmlwg2fdlvfv";
version = "43.0.2357.124";
sha256 = "09m8bb5f17mx6cd3h5irslw07h2s0drda35v17vcr7qfhk8jdh92";
sha256bin32 = "15n2fla1ixrqzi0in0vyl8n5wkv20fpd96lff65rwr9diylz287p";
sha256bin64 = "0x6igpcf29zmwqgphvy9nm527k9g7na2cvgc5nimw4fs5dakzzjr";
};
}

View file

@ -9,7 +9,7 @@ let
then import ./sources.nix
else null;
bucketURL = "http://commondatastorage.googleapis.com/"
bucketURL = "https://commondatastorage.googleapis.com/"
+ "chromium-browser-official";
debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g";

View file

@ -5920,12 +5920,12 @@ let
gyp = buildPythonPackage rec {
name = "gyp-${version}";
version = "2015-05-15";
version = "2015-06-11";
src = pkgs.fetchgit {
url = "https://chromium.googlesource.com/external/gyp.git";
rev = "9f594095c5b14f8bc518081a660e77890c294861";
sha256 = "1xqi44alnw9c31jg2hz7flz5nabq003b4jyin12h3s9zl82y6vd5";
rev = "fdc7b812f99e48c00e9a487bd56751bbeae07043";
sha256 = "176sdxkva2irr1v645nn4q6rwc6grbb1wxj82n7x9hh09q4bxqcz";
};
patches = optionals pkgs.stdenv.isDarwin [
@ -5941,28 +5941,6 @@ let
};
};
# Needed to build Chromium until #7402 is fixed.
gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec {
rev = "1977";
name = "gyp-r${rev}";
src = pkgs.fetchsvn {
url = "http://gyp.googlecode.com/svn/trunk";
inherit rev;
sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8";
};
patches = optionals pkgs.stdenv.isDarwin [
../development/python-modules/gyp/no-darwin-cflags.patch
];
meta = {
homepage = http://code.google.com/p/gyp;
license = licenses.bsd3;
description = "Generate Your Projects";
};
});
guessit = buildPythonPackage rec {
version = "0.9.4";
name = "guessit-${version}";