From 8af443906d795aa562839f4968566dd58b76c0fd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 18 Jun 2021 15:55:37 +0200 Subject: [PATCH] chromiumDev: Fix building from the release tarball See https://bugs.chromium.org/p/chromium/issues/detail?id=1215229. Before this the build failed with this error: [101/47617] ACTION //build/util:chromium_git_revision(//build/toolchain/linux/unbundle:default)oaded_data.pbchain/linux/unbundle:default) FAILED: gen/build/util/chromium_git_revision.h python3 ../../build/util/lastchange.py --header gen/build/util/chromium_git_revision.h --revision-id-only --revision-id-prefix @ -m\ CHROMIUM_GIT_REVISION ERROR:root:Failed to get git top directory from '/build/chromium-93.0.4542.2/build/util': Git command 'git git rev-parse --show-toplevel' in /build/chromium-93.0.4542.2/build/util failed: [Errno 2] No such file or directory: 'git' --- pkgs/applications/networking/browsers/chromium/common.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 156932aa13f1..e417edc1b8f3 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -174,6 +174,12 @@ let sha256 = "1bxdhxmiy6h4acq26lq43x2mxx6rawmfmlgsh5j7w8kyhkw5af0c"; revert = true; }) + # To fix building from a release tarball (which we do): + (githubPatch { + # Revert back to generating chromium_git_revision.h via version.py + commit = "bd524d08f8465364d12d32a84fd1aa983aecc502"; + sha256 = "1jsxidg5jzwkrcpx3lylx4gyg56zjyd7sc957kaaqqc853bn83b4"; + }) ]; postPatch = ''