-
-
Notifications
You must be signed in to change notification settings - Fork 14.7k
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
Calibre fix darwin build #373940
Draft
pitkling
wants to merge
10
commits into
NixOS:master
Choose a base branch
from
pitkling:calibre-fix-darwin-build
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Calibre fix darwin build #373940
+489
−244
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
6.topic: python
6.topic: cuda
Parallel computing platform and API
10.rebuild-darwin: 5001+
10.rebuild-linux: 5001+
labels
Jan 15, 2025
Fast forward to a version required by onnxruntime. (cherry picked until PR NixOS#364362 is merged)
(cherry picked until PR NixOS#364362 is merged)
(cherry picked until PR NixOS#364362 is merged)
(cherry picked from draft PR NixOS#324666)
The upgrade to `0.12.0-rc4` enables building `speechd-minimal` on Darwin.
To include fixes (specifically numediart/MBROLA@d0119cc and numediart/MBROLA@19f31eb) that enable compilation on Darwin.
`data_files` installs into Python's installation prefix (not into the directory of the python module), potentially causing collisions if other packages do the same (with such general files).
`data_files` installs into Python's installation prefix (not into the directory of the python module), potentially causing collisions if other packages do the same (with such general files).
based on a commit of @midchildan from draft PR NixOS#324666
pitkling
force-pushed
the
calibre-fix-darwin-build
branch
from
January 19, 2025 11:57
92defa9
to
935ea6d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
6.topic: cuda
Parallel computing platform and API
6.topic: darwin
Running or building packages on Darwin
6.topic: python
10.rebuild-darwin: 5001+
10.rebuild-linux: 5001+
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is another attempt at getting calibre to work on Darwin, following in the footsteps of draft PR #324666 (by @eliandoran), which itself is based on PR #280559 (by @midchildan). It consists of multiple package updates of calibre's dependencies for Darwin (some from the previous PRs, some added by myself, one from yet another PR that is still in progress) plus an adapted main commit from the previous PRs to fix calibre itself on Darwin.
I would appreciate if @eliandoran and/or @midchildan and the calibre maintainer (@pSub) could take a look. Since the other PRs were somewhat dated and had merge conflicts, I thought it would be best to open a new one. But if you would rather continue one of the old PRs, feel free to do so (and pick from this draft PR whatever you feel suitable).
Specifically, the different commits do the following:
package.nix
)I haven't pinged the maintainers of the updated calibre dependencies yet, since I first wanted to hear back from the original PRs' committers. The updates seem al rather minor, but if someone things (some of) these should be their own PRs, I am happy to extract them.
Current State on Darwin
So far I only tested the main
calibre
binary on Darwin, which seems to work fine except for some issue seemingly with the wrapper. In particular, starting calibre on Darwin with a my existing calibre library in place creates a new ebook.calibre-wrapped
with the contents of the calibre run script (created by calibre during installation). Also, opening one of the existing books for viewing in the GUI via double clicking opens that book successfully, but seemingly also tries to open the.calibre-wrapped
book which naturally throws an error.I have not yet investigated those problems, but will update this description once I did.
For completeness sake: Note that there are also two PRs that aim to bring calibre to Darwin by packaging the prebuilt binaries, see PR #352851 and PR #371442.
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.