PyPy ships with cffi, so don't use external cffi for packages

This commit is contained in:
Domen Kožar 2014-08-31 13:41:27 +02:00
parent b497011da9
commit 7327e3f808

View File

@ -730,7 +730,8 @@ rec {
}; };
buildInputs = [ pkgs.btrfsProgs ]; buildInputs = [ pkgs.btrfsProgs ];
propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser cffi alembic ]; propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ]
++ optionals (!isPyPy) [ cffi ];
meta = { meta = {
description = "Deduplication for Btrfs"; description = "Deduplication for Btrfs";
@ -1513,7 +1514,7 @@ rec {
md5 = "c5df008669d17dd6eeb5e2042d5e136f"; md5 = "c5df008669d17dd6eeb5e2042d5e136f";
}; };
buildInputs = [ cffi pycparser mock pytest py ]; buildInputs = [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ];
meta = { meta = {
maintainers = [ stdenv.lib.maintainers.iElectric ]; maintainers = [ stdenv.lib.maintainers.iElectric ];
@ -5998,7 +5999,7 @@ rec {
export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
'' else "" ); '' else "" );
propagatedBuildInputs = [ pkgs.libgit2 cffi ]; propagatedBuildInputs = [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ];
preCheck = '' preCheck = ''
# disable tests that require networking # disable tests that require networking