Skip to content

[staging-next] gst_all_1.gst-plugins-good: add temporary patch for qt5#247430

Merged
vcunat merged 1 commit intoNixOS:staging-nextfrom
lilyinstarlight:fix/gst-plugins-good-qt
Aug 6, 2023
Merged

[staging-next] gst_all_1.gst-plugins-good: add temporary patch for qt5#247430
vcunat merged 1 commit intoNixOS:staging-nextfrom
lilyinstarlight:fix/gst-plugins-good-qt

Conversation

@lilyinstarlight
Copy link
Copy Markdown
Member

@lilyinstarlight lilyinstarlight commented Aug 6, 2023

Description of changes

Follow-up to #245736

Pulls in upstream MR https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5083

Should fix #245736 (comment)

Staging-next-23.05 change is in #247432

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.

@lilyinstarlight
Copy link
Copy Markdown
Member Author

lilyinstarlight commented Aug 6, 2023

@ofborg build qgroundcontrol nheko

@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 6, 2023
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ideally, I think this kind of patches should be applied no matter what, to make sure they don't bit rot. However, since this change is targeting staging-next, perhaps it is the right thing to do, though I'm not sure. If that's indeed the case, a comment should explain the situation, and hopefully on the next update people will remember to check whether the patch is still required, and if yes whether it still applies.

Copy link
Copy Markdown
Member Author

@lilyinstarlight lilyinstarlight Aug 6, 2023

Choose a reason for hiding this comment

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

Yep, it was conditional to spare rebuilds in the current staging-next cycle. I would have made a separate PR to staging to undo the conditional patch, but I don't imagine this will need to be here long and so didn't really bother

I'll update the comment to make the situation clearer, though, because it could definitely be clearer on why it is conditional and when it can be removed

I already have in my notes to test the various flags during version bumps, so we'll know pretty quick when it's no longer needed since the build will fail due to being unable to apply the patch (most notably of nheko, which requires qt5Support on gst-plugins-good) (edit: also I've subscribed to the upstream MR to know when it is merged and already get notifications on release)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think it's more important to add the Qt variant to standard test set when you touch this package.

@lilyinstarlight lilyinstarlight force-pushed the fix/gst-plugins-good-qt branch from 043a866 to 6907e20 Compare August 6, 2023 11:52
@vcunat vcunat merged commit 69b001c into NixOS:staging-next Aug 6, 2023
@lilyinstarlight lilyinstarlight deleted the fix/gst-plugins-good-qt branch August 6, 2023 15:32
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-darwin: 1 This PR causes 1 package 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.

3 participants