python2Packages.pyspread: init at 1.1 (and fix wxPython to inject required dependencies) #25102
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
FRidh
reviewed
Apr 22, 2017
| @@ -43,6 +45,15 @@ buildPythonPackage rec { | |||
| # this check is supposed to only return false on older systems running non-framework python | |||
| substituteInPlace src/osx_cocoa/_core_wrap.cpp \ | |||
| --replace "return wxPyTestDisplayAvailable();" "return true;" | |||
| '' + lib.optionalString (!stdenv.isDarwin) '' | |||
| substituteInPlace wx/lib/wxcairo.py \ | |||
| --replace 'cairoLib = None' 'cairoLib = ctypes.CDLL("${cairo}/lib/libcairo.so")' | |||
There was a problem hiding this comment.
Darwin (typically) needs .dylib instead of .so. It would be nice if there was a stdenv.libextension attribute that would return the correct extension for the current arch.
There was a problem hiding this comment.
Sounds reasonable but out of scope for this PR no ? :)
|
Will merge in a few hours unless objections… |
|
none go ahead |
|
@FRidh thx |
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
New package + fix wxPython which attempts to locate shared libraries at runtime so we tell it exactly where to find them.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)