libv4l: don't pull qtbase into cross-compiled builds#487060
libv4l: don't pull qtbase into cross-compiled builds#487060doronbehar merged 1 commit intoNixOS:masterfrom
Conversation
4b54f27 to
3e979f9
Compare
3e979f9 to
1550bba
Compare
Yarny0
left a comment
There was a problem hiding this comment.
Hi @eryngion, and thanks for your contribution!
I did some tests, on my x86_64-linux machine:
-
v4l-utilsyields the same derivation hash as before -
libv4lyields the same derivation hash as before -
pkgsCross.aarch64-multiplatform.v4l-utilsbuilds without error -
pkgsCross.aarch64-multiplatform.libv4lbuilds without error
I can't test those cross-compiled packages, unfortunatelly, but I expect them to work.
I approve this pull request being merged.
It is good that you picked staging as the target branch, since v4l-utils usually causes mass rebuild. However, in this case, only cross-compilation is affected, so I suggest to retarget the pull request to master. Please have a look at https://github.com/NixOS/nixpkgs/blob/00c21e4c93d963c50d4c0c89bfa84ed6e0694df2/CONTRIBUTING.md#rebasing-between-branches-ie-from-master-to-staging, as changing the target branch can lead to a mess if not done right.
|
There's one more reason I chose So, if you don't mind, I'd prefer |
Yarny0
left a comment
There was a problem hiding this comment.
I'm not sure if that's really worth it, since master is merged into staging every 6 hours (actually via staging-next, so it would be 12h at most), and merging things into master instead of staging reduces the potential of conflicts for later contributions.
However, in the long run, it will not make a difference. I approve this pull request.
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-already-reviewed/2617/2774 |
1550bba to
cf8640a
Compare
|
I've rebased it onto |
Uh-oh! Sometimes it's best to rebase onto a merge-base of |
cf8640a to
07e4e2b
Compare
Review dismissed automatically
|
I don't have a general advice on how to deal with these kind of situation. What I did now was done with |
07e4e2b to
cf8640a
Compare
Review dismissed automatically
|
Updating base branch with |
|
Thanks @eryngion , for your hard work! I have no objections and reaffirm my approval. |
libv4ldefinition explicitly disableswithUtilswhich in its turn disableswithQt, but without this change the cross-compiled version still pulls inqtbaseas a build-time dependency:Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.