Ensure build/hostPatform when cross compiling from macOS #40639
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 Objections, Corrections? |
Ericson2314
reviewed
May 17, 2018
| @@ -7294,7 +7294,7 @@ with pkgs; | |||
|
|
|||
| python27 = callPackage ../development/interpreters/python/cpython/2.7 { | |||
| self = python27; | |||
| inherit (darwin) CF configd; | |||
| inherit (buildPackages.darwin) CF configd; | |||
There was a problem hiding this comment.
These are used as buildInputs though, and only when the host platform is Darwin, so this shouldn't change any hashes and isn't necessary.
| @@ -10489,7 +10489,7 @@ with pkgs; | |||
| else callPackage ../development/libraries/libunwind { }; | |||
|
|
|||
| libuv = callPackage ../development/libraries/libuv { | |||
| inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; | |||
| inherit (buildPackages.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; | |||
| @@ -153,7 +153,7 @@ let | |||
| ++ optional hostPlatform.isCygwin expat | |||
| ++ [ db gdbm ncurses sqlite readline ] | |||
| ++ optionals x11Support [ tcl tk xlibsWrapper libX11 ] | |||
| ++ optionals stdenv.isDarwin ([ CF ] ++ optional (configd != null) configd); | |||
| ++ optionals hostPlatform.isDarwin ([ CF ] ++ optional (configd != null) configd); | |||
There was a problem hiding this comment.
This in fact means the same thing, but is clearer your way, so let's do it.
|
We think we have fixed the original issue in 279fd72. |
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.
Motivation for this change
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)