public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #26312 from risicle/magic-wormhole-fix

Browse Source 
python.pkgs.magic-wormhole: fix build mostly through adding new dependencies
This commit is contained in:
Jörg Thalheim 2017-06-02 22:47:10 +01:00 committed by GitHub
commit fd9c7b0d9a
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/magic-wormhole/default.nix
View File

@ -1,6 +1,7 @@
{ lib { lib
, buildPythonPackage , buildPythonPackage
, fetchPypi , fetchPypi
, pythonAtLeast
, nettools , nettools
, glibcLocales , glibcLocales
, autobahn , autobahn
@ -12,6 +13,10 @@
, tqdm , tqdm
, python , python
, mock , mock
, ipaddress
, humanize
, pyopenssl
, service-identity
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -26,7 +31,7 @@ buildPythonPackage rec {
checkInputs = [ mock ]; checkInputs = [ mock ];
buildInputs = [ nettools glibcLocales ]; buildInputs = [ nettools glibcLocales ];
propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ]; propagatedBuildInputs = [ autobahn cffi click hkdf pynacl spake2 tqdm ipaddress humanize pyopenssl service-identity ];
postPatch = '' postPatch = ''
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
@ -34,6 +39,8 @@ buildPythonPackage rec {
# XXX: disable one test due to warning: # XXX: disable one test due to warning:
# setlocale: LC_ALL: cannot change locale (en_US.UTF-8) # setlocale: LC_ALL: cannot change locale (en_US.UTF-8)
sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py sed -i -e "s|def test_text_subprocess|def skip_test_text_subprocess|" src/wormhole/test/test_scripts.py
'' + lib.optionalString (pythonAtLeast "3.3") ''
sed -i -e 's|"ipaddress",||' setup.py
''; '';
checkPhase = '' checkPhase = ''