Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[20.03] gn: 20190403 -> 2020-03-09 (backport) #84713

Merged
merged 3 commits into from Apr 14, 2020
Merged

[20.03] gn: 20190403 -> 2020-03-09 (backport) #84713

merged 3 commits into from Apr 14, 2020

Conversation

primeos
Copy link
Member

@primeos primeos commented Apr 8, 2020 •
edited

Motivation for this change

Backport of #83290, required for Chromium M83 (see #83290 (comment)).

I could repeat the testing of #83290 for 20.03. -> Done

Edit: Please also note that the build of chromiumDev should still fail as staging-20.03 doesn't contain 224a5e5 and 3cfa78f.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@primeos
gn: 20190403 -> 2020-03-09
4424442 
This updates gn to the required version for chromiumDev (the recommended
version for the stable release of Chromium isn't sufficient [0]).

[0]: The Chromium build fails during the configuration phase:
ERROR at //mojo/public/tools/bindings/mojom.gni:393:16: Undefined identifier
               "cpp_typemaps",
               ^-------------

(cherry picked from commit a1b4bfe)
@primeos
aseprite.skia: Override the gn version to fix the build
72acf9c 
With NixOS#83290 merged the build would fail during the configuration phase:
```
configuring
ERROR at //gn/BUILDCONFIG.gn:85:14: Script returned non-zero exit code.
  is_clang = exec_script("gn/is_clang.py",
             ^----------
Current dir: /build/source/out/Release/
Command: python /build/source/gn/gn/is_clang.py cc c++
Returned 2.
stderr:

python: can't open file '/build/source/gn/gn/is_clang.py': [Errno 2] No such file or directory
```

(cherry picked from commit ad66bbd)
@primeos
chromiumDev: Override gn to fix the configuration phase
9a7d216 
The configuration phase was failing due to:
```
configuring
ERROR at //BUILD.gn:1376:5: Unknown function.
    filter_exclude([ "$root_build_dir/foo" ],
    ^-------------
```

(cherry picked from commit ad3220f)
@primeos
Copy link
Member Author

primeos commented Apr 14, 2020

It isn't ideal that we have to backport this to 20.03, but it should be fine (at least my tests didn't show any regressions).

@primeos primeos merged commit 07b3634 into NixOS:staging-20.03 Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thefloweringash thefloweringash Awaiting requested review from thefloweringash

@bendlas bendlas Awaiting requested review from bendlas

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@stesie stesie Awaiting requested review from stesie

Assignees
No one assigned
Labels
10.rebuild-darwin: 11-100 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@primeos