diff options
| author | Herwig Hochleitner <herwig@bendlas.net> | 2018-12-09 04:00:42 +0100 |
|---|---|---|
| committer | Herwig Hochleitner <herwig@bendlas.net> | 2018-12-09 04:11:27 +0100 |
| commit | ccb93eb6b0f33c8ad667598c5efffca7f142293d (patch) | |
| tree | a215e4313919799acb4401a6cbf3fb921a8a8357 /pkgs/applications/networking/browsers/chromium/common.nix | |
| parent | 83d84c08b90141a1eb71a6d41cdd054df52c2a49 (diff) | |
| download | nixlib-ccb93eb6b0f33c8ad667598c5efffca7f142293d.tar nixlib-ccb93eb6b0f33c8ad667598c5efffca7f142293d.tar.gz nixlib-ccb93eb6b0f33c8ad667598c5efffca7f142293d.tar.bz2 nixlib-ccb93eb6b0f33c8ad667598c5efffca7f142293d.tar.lz nixlib-ccb93eb6b0f33c8ad667598c5efffca7f142293d.tar.xz nixlib-ccb93eb6b0f33c8ad667598c5efffca7f142293d.tar.zst nixlib-ccb93eb6b0f33c8ad667598c5efffca7f142293d.zip | |
chromium: update conditionals and gcc patches for min version 71
(cherry picked from commit 604579e45f10ce5ccadd76c71f1bac648bd0971d)
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/common.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index aa59daa168e2..bcf6df7417f7 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -121,12 +121,11 @@ let bison gperf kerberos glib gtk2 gtk3 dbus-glib libXScrnSaver libXcursor libXtst libGLU_combined - pciutils protobuf speechd libXdamage + pciutils protobuf speechd libXdamage at-spi2-core ] ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport libpulseaudio - ++ optional (versionAtLeast version "71") at-spi2-core ++ optional (versionAtLeast version "72") jdk.jre; patches = optional enableWideVine ./patches/widevine.patch ++ [ @@ -141,15 +140,8 @@ let # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits # # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (!stdenv.cc.isClang && (versionRange "70" "71")) [ - ( githubPatch "cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4" "0258qlffp6f6izswczb11p8zdpn550z5yqa9z7gdg2rg5171n5i8" ) - ( githubPatch "e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d" "1ky5xrzch6aya87kn0bgb31lksl3g8kh2v8k676ks7pdl2v132p9" ) - ( githubPatch "a4de8da116585357c123d71e5f54d1103824c6df" "1y7afnjrsz6j2l3vy1ms8mrkbb51xhcafw9r371algi48il7rajm" ) - ( githubPatch "b033d2ba32da5ea237656568c25908d4f12b7bac" "008dg8vk822wyrinirx4nh92yq9bki4mwfwvcwnxdjmvz3y0jfcc" ) - ( githubPatch "2f9563e49f6c28dfe52940901417a4031b95a49b" "1q8qhpzx611yzrxa8lgpw0bad9bxx84rsrvczl4xvk5qh93zna7i" ) - ( githubPatch "a66e0a3f3f57eb045639e2752a99ade348dc17e9" "1c5x9856b167z270357wr8l6m1wrznxcx89ykj6kfz5djqmv251g" ) - ( githubPatch "4d9714247f617bf9e1cf95f735148f5e598a9529" "1423jf3lzbljzgbcwvfrrfyhyl3fab988hsyjvk95zyclxff7iij" ) - ( githubPatch "87902b3202f81d689dd314c17006ffc907fe12a1" "15q37cd26s73girq1imcs52fb1irh0qlfvhksh6g0l0jjrdyzk6r" ) + ] ++ optionals (!stdenv.cc.isClang && (versionRange "71" "72")) [ + ( githubPatch "65be571f6ac2f7942b4df9e50b24da517f829eec" "1sqv0aba0mpdi4x4f21zdkxz2cf8ji55ffgbfcr88c5gcg0qn2jh" ) ] ++ optional stdenv.isAarch64 (if (versionOlder version "71") then fetchpatch { |