Merge pull request #35388 from andrew-d/adunham/magic-wormhole-locale
pythonPackages.magic-wormhole: patch the call to 'locale'
This commit is contained in:
commit
97cc03da18
1 changed files with 7 additions and 0 deletions
|
@ -17,6 +17,7 @@
|
|||
, ipaddress
|
||||
, txtorcon
|
||||
, nettools
|
||||
, glibc
|
||||
, glibcLocales
|
||||
, mock
|
||||
, magic-wormhole-transit-relay
|
||||
|
@ -38,6 +39,12 @@ buildPythonPackage rec {
|
|||
postPatch = ''
|
||||
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
|
||||
sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py
|
||||
|
||||
# magic-wormhole will attempt to find all available locales by running
|
||||
# 'locale -a'. If we're building on Linux, then this may result in us
|
||||
# running the system's locale binary instead of the one from Nix, so let's
|
||||
# ensure we patch this.
|
||||
sed -i -e 's|getProcessOutputAndValue("locale"|getProcessOutputAndValue("${glibc}/bin/locale"|' src/wormhole/test/test_cli.py
|
||||
'' + lib.optionalString (pythonAtLeast "3.3") ''
|
||||
sed -i -e 's|"ipaddress",||' setup.py
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue