266 Commits

Author SHA1 Message Date
Yureka
f7be049abd
chromiumDev: fix build
(cherry picked from commit a34f7dbb73831240702c1f60ca24e6f856622575)
2021-09-19 22:26:40 +02:00
Michael Weiss
21edf9c42f
chromium: Move the version helper functions into default.nix
Those functions can be required anywhere in the Nix expressions for
Chromium and therefore they should be defined in default.nix and
inherited where necessary.

This fixes the chromiumBeta build which failed because I forgot to
update the channel conditional when the beta channel advanced to M94.
This is exactly why the version based conditionals should be used
everywhere.

(cherry picked from commit 186315def77d62b53ad6ccdf57ec9593edbe8bc3)
2021-09-03 13:59:33 +02:00
Michael Weiss
d3e31a97e3
chromiumDev: 94.0.4603.0 -> 94.0.4606.12
I've upstreamed fix-missing-atspi2-dependency.patch.

(cherry picked from commit 6ca181b3608eba3d21325ed32c1958536fa7b7df)
2021-09-03 13:59:24 +02:00
Michael Weiss
d3f6410eff
chromium: Document the main gn build flags
(cherry picked from commit a1fdebcef0befd3c81955e5a3d11292a819f84fc)
2021-09-03 13:58:06 +02:00
Michael Weiss
3670f55599
chromiumBeta: Build with LLVM 13
(cherry picked from commit 403ce1a9a3624e7b87606b99ea15f531fa17f8e7)
2021-09-03 13:58:01 +02:00
Michael Weiss
4c19443f54
chromium: Restructure the code
This should make it a little bit easier to read. The (native) build
inputs and options now have a consistent order, defaultDependencies and
yasm aren't required anymore, and this adds some brief comments.
Note: The third_party/node/linux/node-linux-x64/bin/node change causes
rebuilds.

(cherry picked from commit 4a5b36725919c002751228515d518f23772f988e)
2021-09-03 13:56:30 +02:00
Michael Weiss
d14b18dd69
chromiumDev: Fix the build
Note: I've only tested this with llvmPackages_git but it should work
with llvmPackages_13 as well.

fieldtrial_testing_like_official_build was renamed to
disable_fieldtrial_testing_config:
486e9d58c0

(cherry picked from commit 1e372f40047912013568d731208655bd9dab526c)
2021-09-03 13:56:28 +02:00
Michael Weiss
3ababf6d04
chromium: Drop our closure_compiler patch for Java
Hopefully the Java dependency can be dropped soon:
https://bugs.chromium.org/p/chromium/issues/detail?id=1192875#c5

(cherry picked from commit 8505750ac89a1aee154038f6ac9c30cbdd221cfe)
2021-09-03 11:28:51 +02:00
Michael Weiss
701cb52607
chromium: Drop two gn overrides that are not required anymore
The chromium and chromiumBeta builds still succeed.

(cherry picked from commit 2682531c67cefc5110adfa546bfdc66e6374e91f)
2021-09-03 11:27:08 +02:00
Michael Weiss
65b3f3f186
chromium: Restructure gnFlags
This doesn't cause any rebuilds because we use a set but should make it
a bit easier to understand what's going on. This also moves two flags
that where incorrectly in "optionalAttrs pulseSupport" (enabled by
default) out of there.
The native client deprecation is stated here:
https://developer.chrome.com/docs/native-client/

(cherry picked from commit 555c3afaf2b17af6ad06ae82b545ca06e252bcd1)
2021-09-03 11:27:08 +02:00
Michael Weiss
cb026a4a09
chromiumDev: Fix the build
Our system FFmpeg version is too outdated and Snappy causes a linking
failure (I didn't have time to investigate yet). Hopefully we can revert
this before the stable release of M93.

(cherry picked from commit bd22d2425cb7f14b1f98f7432e6ad38208609adb)
2021-09-03 11:27:05 +02:00
Michael Weiss
81c33c7969
chromium: Minimize the diff to nixos-unstable
Keeping the diff minimal makes backporting updates easier.
This is basically e9e5f5f84de backported for Chromium.
2021-09-03 11:23:03 +02:00
Michael Weiss
fa62bb8fac ungoogled-chromium: 91.0.4472.164 -> 92.0.4515.131
(cherry picked from commit 45c32f59a58b69ca6db8c8c5fdbe0ea9eee02376)
2021-08-05 09:26:03 +00:00
TredwellGit
fbeb67dd93 chromium: fix APNG support
https://bugs.chromium.org/p/chromium/issues/detail?id=752403
(cherry picked from commit 52651ca62a9e9bf5833ffda13baed4b96b766381)
2021-06-19 11:17:50 +00:00
Michael Weiss
b6a71637a9
chromiumDev: Revert a patch to fix the build with LLVM 12
The build was failing with:
clang++: error: unknown argument: '-fsanitize-ignorelist=../../tools/cfi/ignores.txt'

(cherry picked from commit 950b321244d541e3c4d05bb163912d53c6c063df)
2021-06-10 19:25:41 +02:00
Michael Weiss
2127c48d06 ungoogled-chromium: 90.0.4430.212 -> 91.0.4472.77
(cherry picked from commit 6c638ee6b10e7b9f567601068a195f45740805fc)
2021-05-31 09:51:05 +00:00
John Ericson
18c38f8aee treewide: All the linker to be chosen independently
This will begin the process of breaking up the `useLLVM` monolith. That
is good in general, but I hope will be good for NetBSD and Darwin in
particular.

Co-authored-by: sterni <sternenseemann@systemli.org>
2021-05-14 21:29:51 +00:00
Michael Weiss
e2adee6827
chromiumDev: Fix the build
python.withPackages avoids the problem with mixed Python 2 and Python 3
dependencies.
2021-05-12 22:54:12 +02:00
Jan Tojnar
468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
Michael Weiss
c0ead3d0c4
chromiumBeta: Add curl as dependency to fix the build
This fixes the following build error:
[14969/46739] CXX obj/third_party/crashpad/crashpad/util/util/http_transport_libcurl.o[KK[K.o[KKy_reader.or.od.ooor_linux.mojom-shared.o
FAILED: obj/third_party/crashpad/crashpad/util/util/http_transport_libcurl.o
clang++ [...]
../../third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc:17:10: fatal error: 'curl/curl.h' file not found
#include <curl/curl.h>
         ^~~~~~~~~~~~~
1 error generated.
2021-05-07 16:13:28 +02:00
Alyssa Ross
a8afbb45c1 treewide: use lib.warnIf where appropriate 2021-04-28 21:44:21 +00:00
Jan Tojnar
0f1c4558d3
Merge branch 'master' into staging-next
Choose binwalk 2.3.1, 27 is legacy version for Python 2.
2021-04-25 02:50:48 +02:00
Michael Weiss
eb335f697e
chromium: Warn about and cleanup old chromiumVersionAtLeast conditionals 2021-04-24 12:47:12 +02:00
Michael Weiss
a82f2a0146
ungoogled-chromium: 89.0.4389.114 -> 90.0.4430.85 2021-04-24 12:21:28 +02:00
github-actions[bot]
6e7c70d02d
Merge master into staging-next 2021-04-24 00:16:17 +00:00
Michael Weiss
0dee033ce7
chromiumDev: Fix the configuration phase (#120464)
The Python 3 support still isn't ready...
2021-04-23 23:24:13 +02:00
github-actions[bot]
120744d620
Merge master into staging-next 2021-04-22 12:06:24 +00:00
Michael Weiss
7495ee4f5f
chromiumDev: 91.0.4472.10 -> 91.0.4472.19 2021-04-22 12:04:15 +02:00
github-actions[bot]
799ebbc91d
Merge master into staging-next 2021-04-21 18:13:29 +00:00
Michael Weiss
80f4cce6fa
chromiumDev: Fix the patch phase 2021-04-21 15:00:14 +02:00
Vladimír Čunát
d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Michael Weiss
acf402b0c0
chromiumDev: Fix the build
Mixing Python 2 and Python 3 causes issues with the Python dependencies.
2021-04-13 13:30:54 +02:00
Michael Weiss
8c60448e26
chromiumDev: Fix two build errors
Python 3 is now required (hard-coded in some scripts, but other scripts
still require Python 2) and a patch is required for [0].

[0]: https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
2021-04-13 10:19:51 +02:00
Luke Granger-Brown
08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
Michael Weiss
5d775bb2b0
chromiumBeta: Fix the build (#119087) 2021-04-11 10:43:29 +02:00
Michael Weiss
227efbd318
chromium: Fix the build (libva redefinition)
The recent libva 2.11.0 update (780fa55) broke the chromium and
ungoogled-chromium builds. Fix #118931.
2021-04-10 12:06:42 +02:00
Gabriel Ebner
aa0b68b26a chromium: add explicit mesa dependency 2021-04-09 09:26:12 +02:00
Sandro Jäckel
dcb501f993
kerberos: deprecate alias 2021-04-04 03:18:56 +02:00
Michael Weiss
dc8eacfba0
Merge pull request #114979 from primeos/chromium-pipewire-0.3
chromium: Switch from PipeWire 0.2 to the current 0.3.x releases
2021-03-11 11:30:13 +01:00
Michael Weiss
36e5fe006a
chromium: Switch from PipeWire 0.2 to the current 0.3.x releases
This should make it work more reliable and support additional features
like window sharing. See [0] for more details.

[0]: https://jgrulich.cz/2020/12/18/webrtc-chromium-updates-in-2020/
2021-03-04 17:53:06 +01:00
Michael Weiss
dc9f2c5e70
chromium: Remove google_default_client_{id,secret}
Reason: Google is limiting access to their private Chrome APIs starting
on March 15, 2021 [0]. Closes #110245.

From the mailing list thread [1]:
"The changes we announced affect the OAuth 2.0 client id and secret
which are used for signing into Chrome, not the API key."
"To avoid using that API, it's sufficient to either not set the OAuth
2.0 credentials, or disabling the Google signin integration" (e.g. by
passing the flag --allow-browser-signin=false)

[0]: https://blog.chromium.org/2021/01/limiting-private-api-availability-in.html
[1]: https://groups.google.com/a/chromium.org/g/chromium-packagers/c/SG6jnsP4pWM/
2021-03-03 13:13:17 +01:00
Michael Weiss
576464c74d
chromium: Remove our old overrides for VA-API and Ozone
These gn arguments aren't required anymore as they're now equal to the
current defaults.
2021-02-06 12:28:50 +01:00
Ben Siraphob
a6ac3eedbd treewide: xdg_utils -> xdg-utils 2021-02-01 15:05:09 +07:00
Michael Weiss
d1c040f8c6
chromiumDev: Build without TFLite and apply a fix
During d6d4228b39b I failed to notice that the current chromiumDev
version is older than the first one that contained the commit to fix the
dependency on opus in webcodecs.
This should hopefully fix build of chromiumDev (if there are no
additional issues).
2021-02-01 01:43:30 +01:00
Michael Weiss
d6d4228b39
chromiumBeta: Backport a patch to fix the build
The build was failing with:
In file included from ../../third_party/blink/renderer/modules/webcodecs/audio_encoder.cc:7:
In file included from ../../media/audio/audio_opus_encoder.h:16:
gen/shim_headers/opus_shim/third_party/opus/src/include/opus.h:5:10: error: 'opus.h' file not found with <angled> include; use "quotes" instead
#include <opus.h>
         ^~~~~~~~
         "opus.h"
[...]
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.
[42272/44233] CXX obj/third_party/blink/renderer/modules/webcodecs/webcodecs/decoder_template.oo[K

Note: This also fixes the ungoogled-chromium channel name in versionRange.
2021-01-30 12:08:17 +01:00
Michael Weiss
241db3bb01
chromium{Beta,Dev}: Disable PGO to "fix" a build error
This also fixes/improves versionRange because the ungoogled-chromium
version will lag behind the Chromium version.
2021-01-28 22:32:32 +01:00
Michael Weiss
fac05ac695
chromium: Don't set "channel" in the environment
The "channel" variable shouldn't be part of the final derivation. This
also makes it possible to avoid unnecessary rebuilds for identical
channels (e.g. major updates are tested via the "beta" channel first and
usually neither the source-code archive nor the dependencies change when
the update makes it into the "stable" channel - this means we could
better use chromiumBeta to test major updates in advance).
2021-01-23 11:54:11 +01:00
Jonathan Ringer
9bb3fccb5b treewide: pkgs.pkgconfig -> pkgs.pkg-config, move pkgconfig to alias.nix
continuation of #109595

pkgconfig was aliased in 2018, however, it remained in
all-packages.nix due to its wide usage. This cleans
up the remaining references to pkgs.pkgsconfig and
moves the entry to aliases.nix.

python3Packages.pkgconfig remained unchanged because
it's the canonical name of the upstream package
on pypi.
2021-01-19 01:16:25 -08:00
Ben Siraphob
badf51221d treewide: stdenv.lib -> lib 2021-01-16 17:58:11 +07:00
Michael Weiss
351f3c043d
chromiumDev: Fix the build (libxshmfence is now required)
Error:
../../components/viz/service/display_embedder/output_presenter_x11.cc:8:10:
fatal error: 'X11/xshmfence.h' file not found
         ^~~~~~~~~~~~~~~~~
1 error generated.
2020-12-25 10:22:06 +01:00