diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-22 19:45:40 +0100 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-01-22 19:45:40 +0100 |
| commit | 0c27903ac04557f2a3de5b385f0fb28321079131 (patch) | |
| tree | 859fbcad8b44981c1fdc9f09e515611c41bcb445 /pkgs/development/python-modules | |
| parent | 7490d4d6988ffdc3d201e439127f4757a616670d (diff) | |
| download | nixlib-0c27903ac04557f2a3de5b385f0fb28321079131.tar nixlib-0c27903ac04557f2a3de5b385f0fb28321079131.tar.gz nixlib-0c27903ac04557f2a3de5b385f0fb28321079131.tar.bz2 nixlib-0c27903ac04557f2a3de5b385f0fb28321079131.tar.lz nixlib-0c27903ac04557f2a3de5b385f0fb28321079131.tar.xz nixlib-0c27903ac04557f2a3de5b385f0fb28321079131.tar.zst nixlib-0c27903ac04557f2a3de5b385f0fb28321079131.zip | |
python-cffi: remove patch for clang
Builds fine without it now.
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/cffi/clang.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/python-modules/cffi/default.nix | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/pkgs/development/python-modules/cffi/clang.patch b/pkgs/development/python-modules/cffi/clang.patch deleted file mode 100644 index 27674edb58b4..000000000000 --- a/pkgs/development/python-modules/cffi/clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/testing/cffi1/test_recompiler.py b/testing/cffi1/test_recompiler.py -index a3277b0..0d6e2c3 100644 ---- a/testing/cffi1/test_recompiler.py -+++ b/testing/cffi1/test_recompiler.py -@@ -2270,7 +2270,7 @@ def test_char16_char32_type(no_cpp=False): - char32_t foo_4bytes(char32_t); - """) - lib = verify(ffi, "test_char16_char32_type" + no_cpp * "_nocpp", """ -- #if !defined(__cplusplus) || __cplusplus < 201103L -+ #if !defined(__cplusplus) - typedef uint_least16_t char16_t; - typedef uint_least32_t char32_t; - #endif diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index cc6ad6a32a7e..6658b76c31ec 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -10,8 +10,6 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d"; }; - patches = stdenv.lib.optional (isPy27 && stdenv.cc.isClang) ./clang.patch; - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; |