diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-29 10:12:24 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-10-29 10:12:24 +0100 |
| commit | 94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794 (patch) | |
| tree | 6d7526de7f8713d248f9eb08853d08b217195f9b /pkgs/development/python-modules/cffi/default.nix | |
| parent | f20a36fcd8feed3671b4c1591dbf4a018eef4cd3 (diff) | |
| download | nixlib-94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794.tar nixlib-94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794.tar.gz nixlib-94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794.tar.bz2 nixlib-94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794.tar.lz nixlib-94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794.tar.xz nixlib-94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794.tar.zst nixlib-94c4a6c0b1961a5cba988f6ba8e7cf7ea2c72794.zip | |
Revert "Merge pull request #30913 from LnL7/darwin-cffi"
This reverts commit f20a36fcd8feed3671b4c1591dbf4a018eef4cd3, reversing changes made to 15350df8d925a335e9004b6ce7219a6215df41d0. I accidentally pressed the Merge button.
Diffstat (limited to 'pkgs/development/python-modules/cffi/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/cffi/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index 3389a6fd7054..5c99e77af56b 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, isPy27, isPyPy, fetchPypi, libffi, pycparser, pytest }: +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, libffi, pycparser, pytest }: if isPyPy then null else buildPythonPackage rec { pname = "cffi"; @@ -10,15 +10,13 @@ if isPyPy then null else buildPythonPackage rec { sha256 = "ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6"; }; - patches = stdenv.lib.optional isPy27 ./clang.patch; - outputs = [ "out" "dev" ]; propagatedBuildInputs = [ libffi pycparser ]; buildInputs = [ pytest ]; # The tests use -Werror but with python3.6 clang detects some unreachable code. - NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isClang [ "-Wno-unused-command-line-argument" "-Wno-unreachable-code" ]; + NIX_CFLAGS_COMPILE = stdenv.lib.optional stdenv.cc.isClang "-Wno-unreachable-code"; checkPhase = '' py.test |