Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

persepolis: ZHF: fix build and runtime errors on darwin #266050

Merged
merged 5 commits into from
Nov 12, 2023

Conversation

iFreilicht
Copy link
Contributor

@iFreilicht iFreilicht commented Nov 7, 2023

Description of changes

This fixes the build and runtime errors on darwin as part of #265948.

Things done

  • Fixed the build of the package on darwin
  • Tried to start the binary, this failed at first
  • Fixed the startup with additional patches
  • Tested basic functionality, found the package has an implicit dependency on ffmpeg
  • Added ffmpeg as well
  • Added myself to the maintainers list
  • Added myself as the maintainer as this package is currently orphaned and I know a little bit about how it works and is built now
  • Replaced abandoned youtube-dl with maintained fork yt-dlp to restore video finder functionality (this was broken on Linux and Darwin)
  • Tested everything once more;
    • Downloaded a small video successfully as well as random files off of github and wikipedia
  • 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/)
  • 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 added the 6.topic: darwin Running or building packages on Darwin label Nov 7, 2023
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/should-i-fix-a-bug-within-nixpkgs-if-upstream-wont/35127/1

Copy link
Contributor

@pbsds pbsds left a comment

Choose a reason for hiding this comment

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

Great work! I don't have darwin so i can't test nor review, but I do have some input reading through the diff.

@pbsds
Copy link
Contributor

pbsds commented Nov 10, 2023

Seems like #266670 got ahead of us. Could you rebase it on top of master an unmark it broken?

@wegank
Copy link
Member

wegank commented Nov 10, 2023

@ofborg build persepolis persepolis.passthru.tests

@wegank wegank merged commit 1dd1d98 into NixOS:master Nov 12, 2023
24 checks passed
@iFreilicht iFreilicht deleted the zhf-fix-persepolis branch November 12, 2023 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants