diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-01-22 20:54:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-22 20:54:06 +0100 |
| commit | 7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb (patch) | |
| tree | 283e534dada3f00f179738eb8f33bf0b12b644fd /pkgs | |
| parent | dda1a7f77ceb135c856f119930a17aa27d7f4e7f (diff) | |
| parent | 505c82efe44b2366360c22f73cce8cd72bd8ac8c (diff) | |
| download | nixlib-7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb.tar nixlib-7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb.tar.gz nixlib-7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb.tar.bz2 nixlib-7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb.tar.lz nixlib-7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb.tar.xz nixlib-7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb.tar.zst nixlib-7c84ddb7a413cdeee694e3d0bf4f31cdbe2e76cb.zip | |
Merge pull request #34158 from LnL7/cffi-clang
python-cffi: fix clang build
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/cffi/clang.patch | 13 | ||||
| -rw-r--r-- | pkgs/development/python-modules/cffi/default.nix | 4 |
2 files changed, 1 insertions, 16 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..28d4a36aca7e 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 ]; @@ -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"; |