summary refs log tree commit diff
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2017-05-22 09:16:08 +0200
committerGitHub <noreply@github.com>2017-05-22 09:16:08 +0200
commit64a924a96b56a4028840a921be67150fc0544116 (patch)
tree2fc94a55ff40ec31d64604eca0d06f141229c420
parent7e40287d00e39bed522c59da805d20c298699411 (diff)
parentc46c3fa5aabd256167059a6f4cf04127dd9506b4 (diff)
downloadnixpkgs-64a924a96b56a4028840a921be67150fc0544116.tar
nixpkgs-64a924a96b56a4028840a921be67150fc0544116.tar.gz
nixpkgs-64a924a96b56a4028840a921be67150fc0544116.tar.bz2
nixpkgs-64a924a96b56a4028840a921be67150fc0544116.tar.lz
nixpkgs-64a924a96b56a4028840a921be67150fc0544116.tar.xz
nixpkgs-64a924a96b56a4028840a921be67150fc0544116.tar.zst
nixpkgs-64a924a96b56a4028840a921be67150fc0544116.zip
Merge pull request #25981 from rimmington/cython-arm-pr
cython: build on 32-bit ARM
-rw-r--r--pkgs/top-level/python-packages.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0b63fb4b41..f210537618e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4253,11 +4253,11 @@ in {
       sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
     };
 
-    # On i686-linux and Python 2.x this test fails because the result is "3L"
-    # instead of "3", so let's fix it in-place.
+    # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
+    # result is "3L" instead of "3", so let's fix it in-place.
     #
     # Upstream issue: https://github.com/cython/cython/issues/1548
-    postPatch = optionalString (stdenv.isi686 && !isPy3k) ''
+    postPatch = optionalString ((stdenv.isi686 || stdenv.isArm) && !isPy3k) ''
       sed -i -e 's/\(>>> *\)\(verify_resolution_GH1533()\)/\1int(\2)/' \
         tests/run/cpdef_enums.pyx
     '';