opencv: fix hardcoded source path#468402
Merged
Aleksanaa merged 1 commit intoNixOS:masterfrom Dec 8, 2025
Merged
Conversation
This should fix builds for non-default fetchedSourceNameDefault and is a no-op for the default.
Aleksanaa
reviewed
Dec 6, 2025
|
|
||
| postUnpack = optionalString buildContrib '' | ||
| cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/source/opencv_contrib" | ||
| cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/${src.name}/opencv_contrib" |
Member
There was a problem hiding this comment.
TIL $NIX_BUILD_TOP exists... Can we just change these to relative paths?
Member
Author
There was a problem hiding this comment.
I just tried it and it looks like that one can be removed without issue, but the one that is used to add the CMake flag cannot have it removed without breaking the build (and one more remains further down in the file).
The setup all looks fairly complicated so I'd prefer to keep that kind of change out of this PR.
nixpkgs-ci
bot
added
10.rebuild-darwin: 0
Member
|
DieracDelta
approved these changes
Dec 6, 2025
nixpkgs-ci
bot
added
the
12.approvals: 1
13 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 should fix builds for non-default fetchedSourceNameDefault and is a no-op for the default.
Cf. #248528
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.Add a 👍 reaction to pull requests you find important.