Skip to content

[staging-next] android-tools: Fix build with protobuf-3.23#249692

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
tobim:pkgs/android-tools-fix-after-protobuf-bump
Aug 18, 2023
Merged

[staging-next] android-tools: Fix build with protobuf-3.23#249692
vcunat merged 1 commit intoNixOS:staging-nextfrom
tobim:pkgs/android-tools-fix-after-protobuf-bump

Conversation

@tobim
Copy link
Copy Markdown
Contributor

@tobim tobim commented Aug 17, 2023

Description of changes

#248496

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot requested a review from primeos August 17, 2023 07:38
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 17, 2023
@tobim tobim force-pushed the pkgs/android-tools-fix-after-protobuf-bump branch from 288c20b to 3ff55b6 Compare August 18, 2023 06:48
@vcunat vcunat merged commit b0b94e8 into NixOS:staging-next Aug 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants