From 0d83bf0db367edb3d4df1dc0dbeb5168acbd166a Mon Sep 17 00:00:00 2001 From: emilylange Date: Tue, 23 Sep 2025 03:26:40 +0200 Subject: [PATCH] chromium: move `export` in `preConfigure` to `env.` Better late than never. This was intended to happen a long time ago. --- .../networking/browsers/chromium/common.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index cdf2aa9eaf65..a6d28e16ed86 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -812,15 +812,7 @@ let // (extraAttrs.gnFlags or { }) ); - # TODO: Migrate this to env.RUSTC_BOOTSTRAP next mass-rebuild. - # Chromium expects nightly/bleeding edge rustc features to be available. - # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires - # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to - # enable those features in our stable builds. - preConfigure = '' - export RUSTC_BOOTSTRAP=1 - '' - + lib.optionalString (!isElectron) '' + preConfigure = lib.optionalString (!isElectron) '' ( cd third_party/node grep patch update_npm_deps | sh @@ -841,6 +833,11 @@ let runHook postConfigure ''; + # Chromium expects nightly/bleeding edge rustc features to be available. + # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires + # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to + # enable those features in our stable builds. + env.RUSTC_BOOTSTRAP = 1; # Mute some warnings that are enabled by default. This is useful because # our Clang is always older than Chromium's and the build logs have a size # of approx. 25 MB without this option (and this saves e.g. 66 %).