wxPython30: fix on darwin #22814
Merged
wxPython30: fix on darwin #22814
+20
−4
Conversation
This file contains hidden or 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
|
I think we should send this to staging. |
veprbl
force-pushed
the
wxpython
branch
2 times, most recently
from
4d88fb8 to
8a01589
Compare
|
This has only ~10 reverse dependencies. |
veprbl
force-pushed
the
wxpython
branch
4 times, most recently
from
fd8fc65 to
6a5010d
Compare
LnL7
reviewed
Feb 16, 2017
|
|
||
| NIX_LDFLAGS = "-lX11 -lgdk-x11-2.0"; | ||
| NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lX11 -lgdk-x11-2.0"; |
There was a problem hiding this comment.
lib.optionalString (!stdenv.isDarwin) is a bit nicer for this
|
|
||
| buildPhase = ""; | ||
|
|
||
| installPhase = '' | ||
| ${python.interpreter} setup.py install WXPORT=gtk2 NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out | ||
| ${python.interpreter} setup.py install WXPORT=${if stdenv.isDarwin then "osx_cocoa" else "gtk2"} NO_HEADERS=1 BUILD_GLCANVAS=${if openglSupport then "1" else "0"} UNICODE=1 --prefix=$out |
There was a problem hiding this comment.
Do those work as environment variables?
LnL7
approved these changes
Feb 17, 2017
|
Thank you! |
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
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)