Skip to content

obs-studio: fix build with Qt 6.10#452548

Merged
fpletz merged 1 commit intoNixOS:masterfrom
fpletz:pkgs/obs-studio-qt-6.10
Oct 16, 2025
Merged

obs-studio: fix build with Qt 6.10#452548
fpletz merged 1 commit intoNixOS:masterfrom
fpletz:pkgs/obs-studio-qt-6.10

Conversation

@fpletz
Copy link
Member

@fpletz fpletz commented Oct 16, 2025

See #449572 (comment).

This can be merged to master since it also compiles with Qt 6.9.

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@fpletz fpletz mentioned this pull request Oct 16, 2025
Merged
13 tasks
@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. labels Oct 16, 2025
@nix-owners nix-owners bot requested review from jb55 and materusPL October 16, 2025 10:43
@nixpkgs-ci nixpkgs-ci bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Oct 16, 2025
@vcunat
Copy link
Member

vcunat commented Oct 16, 2025

I've heard that for stability of fetchpatch2 hashes you need to pass full_index=1 (in case of GitHub), contrary to fetchpatch.

@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Oct 16, 2025
@fpletz fpletz force-pushed the pkgs/obs-studio-qt-6.10 branch from f6be031 to ef62549 Compare October 16, 2025 12:46
@fpletz
Copy link
Member Author

fpletz commented Oct 16, 2025

Interesting, thanks! I used fetchpatch2 because I thought it was preferred these days. It's a bit odd that only fetchpach2 has problems with hash stability since the only difference seems to be a current version of patchutils.

However, after some researching about the --full-index option, I think it's generally a good idea to provide that option regardless of our fetchpatch version.

PR updated to include that option in the patch URL.

@vcunat
Copy link
Member

vcunat commented Oct 16, 2025 •
edited
Loading

fetchpatch is better in some respects (index-es get removed), fetchpatch2 in some others (e.g. renames of files, I think). Some systems don't even provide you an option like full_index=1.

@nixpkgs-ci nixpkgs-ci bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Oct 16, 2025
@fpletz
Copy link
Member Author

fpletz commented Oct 16, 2025

Merging this now as-is. The patch can be dropped soon as it will probably be shipped with the next obs-studio patch release.

@fpletz fpletz added this pull request to the merge queue Oct 16, 2025
Merged via the queue into NixOS:master with commit 694bb62 Oct 16, 2025
26 checks passed
@fpletz fpletz deleted the pkgs/obs-studio-qt-6.10 branch October 16, 2025 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@jb55 jb55 Awaiting requested review from jb55

@materusPL materusPL Awaiting requested review from materusPL

Assignees

No one assigned

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. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fpletz @vcunat @SuperSandro2000