summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-08-31 13:41:27 +0200
committerDomen Kožar <domen@dev.si>2014-08-31 13:41:27 +0200
commit7327e3f808a5e2fa2eb239947580c5892f5f75e3 (patch)
treee7cdc60e56558558ed8569b7f7e97e46fbba75bf /pkgs/top-level
parentb497011da9bcf4c7791565d81b26c919aeb2b03d (diff)
downloadnixpkgs-7327e3f808a5e2fa2eb239947580c5892f5f75e3.tar
nixpkgs-7327e3f808a5e2fa2eb239947580c5892f5f75e3.tar.gz
nixpkgs-7327e3f808a5e2fa2eb239947580c5892f5f75e3.tar.bz2
nixpkgs-7327e3f808a5e2fa2eb239947580c5892f5f75e3.tar.lz
nixpkgs-7327e3f808a5e2fa2eb239947580c5892f5f75e3.tar.xz
nixpkgs-7327e3f808a5e2fa2eb239947580c5892f5f75e3.tar.zst
nixpkgs-7327e3f808a5e2fa2eb239947580c5892f5f75e3.zip
PyPy ships with cffi, so don't use external cffi for packages
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/python-packages.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55944225a18..31c30678ec0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -730,7 +730,8 @@ rec {
     };
 
     buildInputs = [ pkgs.btrfsProgs ];
-    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser cffi alembic ];
+    propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ]
+      ++ optionals (!isPyPy) [ cffi ];
 
     meta = {
       description = "Deduplication for Btrfs";
@@ -1513,7 +1514,7 @@ rec {
       md5 = "c5df008669d17dd6eeb5e2042d5e136f";
     };
 
-    buildInputs = [ cffi pycparser mock pytest py ];
+    buildInputs = [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ];
 
     meta = {
       maintainers = [ stdenv.lib.maintainers.iElectric ];
@@ -5998,7 +5999,7 @@ rec {
       export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib"
     '' else "" );
 
-    propagatedBuildInputs = [ pkgs.libgit2 cffi ];
+    propagatedBuildInputs = [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ];
 
     preCheck = ''
       # disable tests that require networking