From ab7460070860e48e56bf5c873b2c80ca02030db6 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 27 Jul 2025 10:01:35 +0200 Subject: [PATCH] chromium, electron: use override instead of overrideAttrs for gn Co-authored-by: emilylange Signed-off-by: Marcin Serwin --- .../networking/browsers/chromium/default.nix | 8 +------- .../networking/browsers/chromium/info.json | 6 ++++-- pkgs/development/tools/electron/info.json | 15 ++++++--------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 990eafa06677..58cb30f335ad 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -79,13 +79,7 @@ let pulseSupport ungoogled ; - gnChromium = buildPackages.gn.overrideAttrs (oldAttrs: { - version = if (upstream-info.deps.gn ? "version") then upstream-info.deps.gn.version else "0"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - inherit (upstream-info.deps.gn) rev hash; - }; - }); + gnChromium = buildPackages.gn.override upstream-info.deps.gn; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index eb1b32f6892f..0018ece27e34 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -12,8 +12,9 @@ "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo=" }, "gn": { + "version": "0-unstable-2025-06-19", "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82", - "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo=" + "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=" }, "npmHash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI=" }, @@ -809,8 +810,9 @@ "hash": "sha256-UouvzNFStYScnyfIJcz1Om7cDhC7EyShZQ/Icu73BPo=" }, "gn": { + "version": "0-unstable-2025-06-19", "rev": "97b68a0bb62b7528bc3491c7949d6804223c2b82", - "hash": "sha256-m+z10s40Q/iYcoMw3o/+tmhIdqHMsYJjdGabHrK/aqo=" + "hash": "sha256-gwptzuirIdPAV9XCaAT09aM/fY7d6xgBU7oSu9C4tmE=" }, "ungoogled-patches": { "rev": "139.0.7258.66-1", diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json index 13aa8d2762f8..9719f9c19b00 100644 --- a/pkgs/development/tools/electron/info.json +++ b/pkgs/development/tools/electron/info.json @@ -4,10 +4,9 @@ "chromium": { "deps": { "gn": { - "hash": "sha256-EqbwCLkseND1v3UqM+49N7GuoXJ3PlJjWOes4OijQ3U=", + "hash": "sha256-U0f/Q134UJrSke+/o9Hs4+mQa/vSM2hdkRXhLfhnqME=", "rev": "ed1abc107815210dc66ec439542bee2f6cbabc00", - "url": "https://gn.googlesource.com/gn", - "version": "2025-01-13" + "version": "0-unstable-2025-01-13" } }, "version": "134.0.6998.205" @@ -1313,10 +1312,9 @@ "chromium": { "deps": { "gn": { - "hash": "sha256-vDKMt23RMDI+KX6CmjfeOhRv2haf/mDOuHpWKnlODcg=", + "hash": "sha256-MnGl+D9ahQibUHCtyOUf1snvmeupUn4D2yrDj55JTe4=", "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444", - "url": "https://gn.googlesource.com/gn", - "version": "2025-03-24" + "version": "0-unstable-2025-03-24" } }, "version": "136.0.7103.177" @@ -2638,10 +2636,9 @@ "chromium": { "deps": { "gn": { - "hash": "sha256-UB9a7Fr1W0yYld6WbXyRR8dFqWsj/zx4KumDZ5JQKSM=", + "hash": "sha256-BplU8qNKObVrKMLKTyqivPF1L6bbJulFC+Zop9UpmZY=", "rev": "ebc8f16ca7b0d36a3e532ee90896f9eb48e5423b", - "url": "https://gn.googlesource.com/gn", - "version": "2025-05-21" + "version": "0-unstable-2025-05-21" } }, "version": "138.0.7204.185"