JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34158 from LnL7/cffi-clang

Browse Source 
python-cffi: fix clang build
This commit is contained in:
Daiderd Jordan 2018-01-22 20:54:06 +01:00 committed by GitHub
commit 7c84ddb7a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/python-modules/cffi/clang.patch
View File

@ -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

4
pkgs/development/python-modules/cffi/default.nix
View File

@ -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 ];
@ -39,7 +37,7 @@ if isPyPy then null else buildPythonPackage rec {
'';
meta = with stdenv.lib; {
maintainers = with maintainers; [ domenkozar ];
maintainers = with maintainers; [ domenkozar lnl7 ];
homepage = https://cffi.readthedocs.org/;
license = with licenses; [ mit ];
description = "Foreign Function Interface for Python calling C code";