treewide: Remove uses of crossConfig and add strictDeps #40539
Closed
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
Ericson2314
changed the title
The hack of using `crossConfig` to enforce stricter handling of dependencies is replaced with a dedicated `strictDeps` for that purpose. (Experience has shown that my punning was a terrible idea that made more difficult and embarrising to teach teach.) Now that is is clear, a few packages now use `strictDeps`, to fix various bugs: - bintools-wrapper and cc-wrapper
Ericson2314
force-pushed
the
strictDeps-for-18.03
branch
from
e5a77e0
to
330ca73
Compare
|
Going to wait for the dust to settle a bit on #40529 first. |
|
These sort of hundred line changes are not 18.03 material. |
dtzWill
reviewed
May 15, 2018
| ] ++ (if useSharedLibraries then [ "--no-system-jsoncpp" "--system-libs" ] else [ "--no-system-libs" ]) # FIXME: cleanup | ||
| ++ optional (useQt4 || withQt5) "--qt-gui" | ||
| ++ ["--"] | ||
| ++ optionals (!useNcurses) [ "-DBUILD_CursesDialog=OFF" ]; |
There was a problem hiding this comment.
This seems to break native building of cmake: https://hydra.nixos.org/build/74265837/nixlog/1 .
Can someone take a look at this? Lots of things dep on cmake! :)
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.
Backport of #40529
I carefully kept the definition of
crossConfigin the stdenv adapter, as removing it would be a breaking change.Motivation for this change
Besides the general idea of back-porting simple cross fixes,
strictDepsis needed to make some large Haskell apps build. Yes, this can already be accomplished withcrossConfig = true, but that is awful to teach and not really a public interface.Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)CC @srhb @TravisWhitaker