diff options
| author | Robert Schütz <rschuetz17@gmail.com> | 2018-02-27 14:47:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 14:47:23 +0100 |
| commit | 97cc03da18595b6cd96054692b4a8ad47d6455d4 (patch) | |
| tree | 308cb5fcf5b4dce183a9dc12981a0c7f6bcd2cfc /pkgs | |
| parent | 46593abb3d6430fbfd3af915524ac0e7435fdf30 (diff) | |
| parent | 9170269542b03901f16db3c4519c19c4d98e374f (diff) | |
| download | nixlib-97cc03da18595b6cd96054692b4a8ad47d6455d4.tar nixlib-97cc03da18595b6cd96054692b4a8ad47d6455d4.tar.gz nixlib-97cc03da18595b6cd96054692b4a8ad47d6455d4.tar.bz2 nixlib-97cc03da18595b6cd96054692b4a8ad47d6455d4.tar.lz nixlib-97cc03da18595b6cd96054692b4a8ad47d6455d4.tar.xz nixlib-97cc03da18595b6cd96054692b4a8ad47d6455d4.tar.zst nixlib-97cc03da18595b6cd96054692b4a8ad47d6455d4.zip | |
Merge pull request #35388 from andrew-d/adunham/magic-wormhole-locale
pythonPackages.magic-wormhole: patch the call to 'locale'
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/magic-wormhole/default.nix | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix index cef68a332cd9..7d170345dbbe 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 ''; |