Unverified Commit 7d217e37 authored by aszlig's avatar aszlig
Browse files

Merge branch ambrop72/chromium-update. 

Upgrades and fixes the build of the current Chromium stable channel.

 * Update versions.
 * Use gyp package not gyp_svn1977.
 * Remove icu from buildInputs, since this causes a build error due to
   inferference with use_system_icu=false.
 * Remove the hack that inserts the absolute path into gyp files, and
   pass --depth . to gyp. This resolves the third_party/angle gyp error.
 * Do a normal copy of the source code not a symlink copy. This resolves
   some link error where the symlinks interfere with relative paths
   (seems like because gyp resolves symlinks first). Note, this used to
   be worked around with the absolute path insertion hack.
 * Change the bucketURL in update.nix to https (for more secure
   updates).
parents 7a0ca522 58fd4f67

pkgs/applications/networking/browsers/chromium/common.nix

+6 −11
Original line number Diff line number Diff line 
{ 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

pkgs/applications/networking/browsers/chromium/source/sources.nix

+12 −12
Original line number Diff line number Diff line 
# 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";

  };

}

pkgs/applications/networking/browsers/chromium/source/update.nix

+1 −1
Original line number Diff line number Diff line
@@ -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";