From 9170269542b03901f16db3c4519c19c4d98e374f Mon Sep 17 00:00:00 2001 From: Andrew Dunham Date: Fri, 23 Feb 2018 17:27:23 +0800 Subject: [PATCH] pythonPackages.magic-wormhole: patch the call to 'locale' --- pkgs/development/python-modules/magic-wormhole/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index cef68a332cd..7d170345dbb 100644 --- a/pkgs/development/python-modules/magic-wormhole/default.nix +++ b/pkgs/development/python-modules/magic-wormhole/default.nix @@ -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 '';