Skip to content

ruffle: nightly-2025-01-04 -> nightly-2025-01-25#376808

Merged
pbsds merged 2 commits intomasterfrom
unknown repository
Feb 14, 2025
Merged

ruffle: nightly-2025-01-04 -> nightly-2025-01-25#376808
pbsds merged 2 commits intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jan 25, 2025

In addition to a simple version bump, I have significantly refactored the derivation for ruffle to resolve inconsistencies and add features.

For summary:

  • Patched fetchFromGitHub to use tag and factored out pname
  • Replaced occurrences of stdenv with stdenvNoCC
  • Refactored postInstall
    • Namespaced binaries with "ruffle_" as to avoid any potential naming conflicts.
    • Renamed ruffle_desktop to just ruffle.
  • Furnished the package's meta fields to add more information.
  • Moved attributes in logical order for readability.
  • Wrapped openh264 to avoid downloading at runtime.
  • Used a patch file to solve issue ruffle_desktop doesn't properly get current time due to "deterministic" build feature #285887.

I don't have a Darwin machine, so that still requires testing (I'm not aware if changing the binary name affects MacOS), if everything looks good then I'll squash and rebase if needed.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

Add a 👍 reaction to pull requests you find important.

@ghost ghost requested a review from jchv January 25, 2025 22:11
@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 25, 2025
@nix-owners nix-owners bot requested a review from GovanifY January 25, 2025 23:22
@ghost
Copy link
Author

ghost commented Jan 25, 2025

I can also submit a patch to remove GovanifY from meta.maintainers based on previous discussions

@jchv
Copy link
Contributor

jchv commented Jan 28, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 376808


x86_64-linux

✅ 1 package built:
  • ruffle

@jchv
Copy link
Contributor

jchv commented Jan 28, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 376808


aarch64-darwin

✅ 1 package built:
  • ruffle

Copy link
Contributor

@jchv jchv left a comment

Choose a reason for hiding this comment

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

Tested on x86-64 Linux with Wayland and X11, tested on aarch64 Darwin. Diff LGTM.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Feb 1, 2025
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/2239

@pbsds pbsds merged commit 56af213 into NixOS:master Feb 14, 2025
28 checks passed
@ghost ghost deleted the update-ruffle-jan branch February 20, 2025 01:45
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. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 1 This PR was reviewed and approved by one person.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants