casync: fix cross compilation by passing the correct sphinx #192169
Merged
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
ofborg
bot
added
10.rebuild-darwin: 0
ck3d
reviewed
Sep 22, 2022
| @@ -3247,7 +3247,7 @@ with pkgs; | |||
| keystone = callPackage ../development/libraries/keystone { }; | |||
|
|
|||
| casync = callPackage ../applications/networking/sync/casync { | |||
| sphinx = python3Packages.sphinx; | |||
| sphinx = buildPackages.python3Packages.sphinx; | |||
There was a problem hiding this comment.
sphinx is used in derivation as native build input. To avoid following issue, the recommended way is to use buildPackages:
#49526
I did not build or test this packages, but can you explain why you had to change this line?
There was a problem hiding this comment.
The splicing magic fails when parameters are explicitly passed to callPackage, thus it's required to prefix buildPackages to get the right sphinx.
There was a problem hiding this comment.
You are absolutely right. When I first read the diff, I thought you removed buildPackages. I missinterpreted the diff, for some reason.
ck3d
approved these changes
Sep 23, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description of changes
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes