Skip to content

Comments

spice: fixes for meson upgrade#147267

Merged
alyssais merged 2 commits intoNixOS:masterfrom
alyssais:spice-meson
Nov 24, 2021
Merged

spice: fixes for meson upgrade#147267
alyssais merged 2 commits intoNixOS:masterfrom
alyssais:spice-meson

Conversation

@alyssais
Copy link
Member

Motivation for this change

We'll need these to keep spice working after #144779. But it doesn't hurt to get them in separately, in advance, so there's less to do in that PR.

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/)
  • 21.11 Release Notes (or backporting 21.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

celt support has been removed upstream, and this option no longer
exists.  Setting an unknown option is a hard error with Meson ≥0.60.0.
@ofborg ofborg bot requested a review from bluescreen303 November 24, 2021 16:08
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Nov 24, 2021
Copy link
Member

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@alyssais alyssais merged commit c4d7b1c into NixOS:master Nov 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants