valgrind: disable on darwin #101442
Merged
valgrind: disable on darwin #101442
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-linux: 0
and removed
10.rebuild-linux: 501+
10.rebuild-linux: 501-1000
labels
vcunat
reviewed
Oct 23, 2020
vcunat
approved these changes
Oct 23, 2020
marsam
reviewed
Oct 23, 2020
Comment on lines
+34
to
36
| (stdenv.lib.optionalString (!stdenv.isDarwin) valgrind) | ||
| libxslt | ||
| ]; |
There was a problem hiding this comment.
Suggested change
| (stdenv.lib.optionalString (!stdenv.isDarwin) valgrind) | |
| libxslt | |
| ]; | |
| libxslt | |
| ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ valgrind ]; |
besides that, LGTM
There was a problem hiding this comment.
That is what I did first but it causes unnecessary rebuilds on linux.
There was a problem hiding this comment.
oh, interesting, I'm not sure why it should cause rebuilds on Linux
There was a problem hiding this comment.
The order of build inputs is preserved into the build process itself.
marsam
approved these changes
Oct 23, 2020
|
Pushed a cleaned up version of this to staging: d126f0b |
Unfortunately there's another problem: https://hydra.nixos.org/job/nixpkgs/trunk/nix-info-tested.x86_64-darwin |
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.
Our macOS SDKs are from 10.12 but our cctools is from 10.14 so I think that basically kills off
valgrindon darwin as upstream doesn't support it on >= 10.13 and no one seems to be building it on >= 10.14.The
libpslcommit should be enough to unblocknixpkgs-unstable.