diff options
| author | Yuriy Taraday <yorik.sar@gmail.com> | 2018-09-07 23:34:47 +0400 |
|---|---|---|
| committer | Yuriy Taraday <yorik.sar@gmail.com> | 2018-09-07 23:34:47 +0400 |
| commit | c098f143b4a1325734f636d3e12abb2275ba9532 (patch) | |
| tree | 3e90d6aaa2740d16120f04f174068735787608d1 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | af8125c46f51ea0c15e50c994216ed1c428ba7bf (diff) | |
| download | nixpkgs-c098f143b4a1325734f636d3e12abb2275ba9532.tar nixpkgs-c098f143b4a1325734f636d3e12abb2275ba9532.tar.gz nixpkgs-c098f143b4a1325734f636d3e12abb2275ba9532.tar.bz2 nixpkgs-c098f143b4a1325734f636d3e12abb2275ba9532.tar.lz nixpkgs-c098f143b4a1325734f636d3e12abb2275ba9532.tar.xz nixpkgs-c098f143b4a1325734f636d3e12abb2275ba9532.tar.zst nixpkgs-c098f143b4a1325734f636d3e12abb2275ba9532.zip | |
chromium: 68.0.3440.106 -> 69.0.3497.81
Also update to build with external gn.
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index ebc700a7f37..6b9f7225c84 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, ninja, which, nodejs, fetchurl, fetchpatch, gnutar +{ stdenv, gn, ninja, which, nodejs, fetchurl, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -139,11 +139,6 @@ let # (gentooPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000") ./patches/fix-freetype.patch ./patches/nix_plugin_paths_68.patch - ] ++ optionals (versionRange "68" "69") [ - ./patches/remove-webp-include-68.patch - (githubPatch "4d10424f9e2a06978cdd6cdf5403fcaef18e49fc" "11la1jycmr5b5rw89mzcdwznmd2qh28sghvz9klr1qhmsmw1vzjc") - (githubPatch "56cb5f7da1025f6db869e840ed34d3b98b9ab899" "04mp5r1yvdvdx6m12g3lw3z51bzh7m3gr73mhblkn4wxdbvi3dcs") - ] ++ optionals (versionAtLeast version "69") [ ./patches/remove-webp-include-69.patch ] ++ optional enableWideVine ./patches/widevine.patch; @@ -243,15 +238,11 @@ let configurePhase = '' runHook preConfigure - # Build gn - python tools/gn/bootstrap/bootstrap.py -v -s --no-clean - PATH="$PWD/out/Release:$PATH" - # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + ${gn}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 |