Skip to content
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

valgrind: disable on darwin #101442

Merged
merged 2 commits into from Oct 23, 2020
Merged

valgrind: disable on darwin #101442

merged 2 commits into from Oct 23, 2020

Conversation

@zowoq
Copy link
Contributor

@zowoq zowoq commented Oct 23, 2020

Our macOS SDKs are from 10.12 but our cctools is from 10.14 so I think that basically kills off valgrind on darwin as upstream doesn't support it on >= 10.13 and no one seems to be building it on >= 10.14.

https://valgrind.org/
22 June 2020: valgrind-3.16.1 is available. This release supports: .... X86/MacOSX 10.12 and AMD64/MacOSX 10.12.

homebrew valgrind
depends_on maximum_macos: :high_sierra

macports valgrind
is not presently compatible with macOS Mojave or newer


The libpsl commit should be enough to unblock nixpkgs-unstable.

@zowoq zowoq changed the title valgrind valgrind: disable on darwin Oct 23, 2020
@zowoq
Copy link
Contributor Author

@zowoq zowoq commented Oct 23, 2020

@zowoq zowoq marked this pull request as ready for review Oct 23, 2020
vcunat
vcunat approved these changes Oct 23, 2020
(stdenv.lib.optionalString (!stdenv.isDarwin) valgrind)
libxslt
];
Copy link
Contributor

@marsam marsam Oct 23, 2020

Suggested change
(stdenv.lib.optionalString (!stdenv.isDarwin) valgrind)
libxslt
];
libxslt
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ valgrind ];

besides that, LGTM

Copy link
Contributor Author

@zowoq zowoq Oct 23, 2020

That is what I did first but it causes unnecessary rebuilds on linux.

Copy link
Contributor

@marsam marsam Oct 23, 2020

oh, interesting, I'm not sure why it should cause rebuilds on Linux

Copy link
Member

@vcunat vcunat Oct 23, 2020

The order of build inputs is preserved into the build process itself.

Copy link
Contributor

@marsam marsam Oct 23, 2020

TIL thanks!

marsam
marsam approved these changes Oct 23, 2020
@zowoq zowoq merged commit 76d8e2f into NixOS:master Oct 23, 2020
19 of 20 checks passed
@zowoq zowoq deleted the valgrind branch Oct 23, 2020
@zowoq
Copy link
Contributor Author

@zowoq zowoq commented Oct 24, 2020

Pushed a cleaned up version of this to staging: d126f0b

@vcunat
Copy link
Member

@vcunat vcunat commented Oct 24, 2020

should be enough to unblock nixpkgs-unstable.

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
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants