gst_all_1.gstreamer: use a better libunwind check #339006
Merged
+16
−6
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
This will allow packages like gstreamer that need to find libunwind via pkg-config to check whether the libunwind they've been given has the modules they expect.
Checking for Darwin didn't take into account that we also use a libunwind implementation without pkg-config on riscv32-linux. Fix by checking for the presence of the pkg-config file required directly, rather than by using platform as a proxy.
alyssais
force-pushed
the
gstreamer-libunwind
branch
from
b4ea269
to
52b0b4e
Compare
emilazy
approved these changes
Sep 3, 2024
| , withLibunwind ? !stdenv.isDarwin && lib.meta.availableOn stdenv.hostPlatform libunwind | ||
| , withLibunwind ? | ||
| lib.meta.availableOn stdenv.hostPlatform libunwind && | ||
| lib.elem "libunwind" libunwind.meta.pkgConfigModules or [] |
There was a problem hiding this comment.
Nit: I find f x.a or b to be a really confusing parse, and would prefer parentheses around the relevant subexpression here. (Non‐blocking, will merge soon regardless of any response if you don’t beat me to it.)
There was a problem hiding this comment.
I also find it confusing, but unless we can enforce parentheses treewide, I think it's better to teach it through exposure, rather than making it rare and therefore even more surprising.
There was a problem hiding this comment.
Opened NixOS/nixfmt#251 and merging :)
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
Checking for Darwin didn't take into account that we also use a
libunwind implementation without pkg-config on riscv32-linux. Fix by
checking for the presence of the pkg-config file required directly,
rather than by using platform as a proxy.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-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.