-
-
Notifications
You must be signed in to change notification settings - Fork 15k
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
wayland: don't propagate bin output #328804
Conversation
TIL propagatedBuildOutputs! I should really finish #214906 … |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On a more general note:
- This should maybe exclude "binaries":
nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh
Lines 195 to 197 in db5bef9
# Default value: propagate binaries, includes and libraries if [ -z "${propagatedBuildOutputs+1}" ]; then local po_dirty="$outputBin $outputInclude $outputLib" - It's often awkward we cannot get headers (which we put into
.dev
) separately frompropagatedBuildOutputs
. In this case it was an issue for cross-compilation. Another instance where I encountered this is when I wanted to buildscipy
againstnumpy_2
and propagatenumpy
(<2) for wider compatibility
This fixes the host platform wayland-scanner binary leaking into cross builds.
2e85626
to
3f15de5
Compare
Added the comment, and re-targeted to staging. |
Bisect says the change broke
|
Thanks for the ping, will take a look. |
`wayland-scanner` is in `wayland.bin`. This previously only worked as wayland propagated its `bin` output. See NixOS#328804 for context.
Fix in #329452. Will quickly check all other gst packages. |
This reverts commit 3f15de5. As commented in NixOS#328804 (comment), this broke quite some builds, and some of the interactions between wayland and its `.pc` file are still uncertain. Revert for now, and re-roll this later.
It should be possible to re‐apply this now that @paparodeo’s work in #318226 has landed in |
It shouldn't be necessary |
In fact, I think we should maybe remove the custom |
Thanks @alyssais I didn't know about this one. A separate derivation sounds even better |
(If anybody wants to take over that PR please do — the main thing that was hard about it was checking there were no cross regressions, but tbh mostly I think I got distracted by trying to fix packages that didn't cross compile anyway! I don't know when I'll have time to pick it back up now.) |
This fixes the host platform wayland-scanner binary leaking into cross builds.
Fixes
pkgsCross.aarch64-multiplatform.glfw
for example.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.