diff options
| author | Niklas Hambüchen <mail@nh2.me> | 2018-06-19 02:48:42 +0200 |
|---|---|---|
| committer | Niklas Hambüchen <mail@nh2.me> | 2018-06-19 02:56:27 +0200 |
| commit | 95358db95645863ae758da5c74db4671d97fcf1e (patch) | |
| tree | 9d685460f75fa772c50727f5da14c9b55ed0d3cd /pkgs/applications | |
| parent | 1f8f89d309eeebfe00b25c30cc9dca103f3d8b47 (diff) | |
| download | nixlib-95358db95645863ae758da5c74db4671d97fcf1e.tar nixlib-95358db95645863ae758da5c74db4671d97fcf1e.tar.gz nixlib-95358db95645863ae758da5c74db4671d97fcf1e.tar.bz2 nixlib-95358db95645863ae758da5c74db4671d97fcf1e.tar.lz nixlib-95358db95645863ae758da5c74db4671d97fcf1e.tar.xz nixlib-95358db95645863ae758da5c74db4671d97fcf1e.tar.zst nixlib-95358db95645863ae758da5c74db4671d97fcf1e.zip | |
chromium: Abort build on gn warnings. Fixes #42189.
Also fix such obsolete flags: * `use_gconf` was already known to become obsolete with Chromium 65 * `enable_hotwording` has been removed in upstream commit d693f0c7ab
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/common.nix | 9 | ||||
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 7803a530a92a..dbfd47534164 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -22,7 +22,6 @@ # package customization , enableNaCl ? false -, enableHotwording ? false , enableWideVine ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null @@ -215,11 +214,8 @@ let proprietary_codecs = false; use_sysroot = false; use_gnome_keyring = gnomeKeyringSupport; - ## FIXME remove use_gconf after chromium 65 has become stable - use_gconf = gnomeSupport; use_gio = gnomeSupport; enable_nacl = enableNaCl; - enable_hotwording = enableHotwording; enable_widevine = enableWideVine; use_cups = cupsSupport; @@ -259,7 +255,10 @@ let libExecPath="${libExecPath}" python build/linux/unbundle/replace_gn_files.py \ --system-libraries ${toString gnSystemLibraries} - gn gen --args=${escapeShellArg gnFlags} out/Release + 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 runHook postConfigure ''; diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 1458a1816569..d2bb04251705 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -4,7 +4,6 @@ # package customization , channel ? "stable" , enableNaCl ? false -, enableHotwording ? false , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true @@ -22,7 +21,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableNaCl enableHotwording gnomeSupport gnome + inherit enableNaCl gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport enableWideVine; }; |