diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-10 20:09:37 +0000 |
| commit | 45431c078bf8f54aef7c9fae2e5913395ec82c31 (patch) | |
| tree | fd8ff1346a963ddd72e782421f05b623f9759e2a /nixpkgs/pkgs/development/python-modules/protobuf | |
| parent | c86fea6086c212ea489cfb023a5f5c9c8f188810 (diff) | |
| parent | 3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5 (diff) | |
Merge commit '3ccbc8d89153ecf13f3eae7d9c106d91cd4ab9e5' into fuckthisshit
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/protobuf')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/protobuf/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index d5ff4b04c59..73216f63f82 100644 --- a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchpatch, python, buildPythonPackage, isPy37 -, protobuf, google_apputils, pyext, libcxx +, protobuf, google_apputils, pyext, libcxx, isPy27 , disabled, doCheck ? true }: with stdenv.lib; buildPythonPackage { inherit (protobuf) name src version; - inherit disabled doCheck; + inherit disabled; + doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 NIX_CFLAGS_COMPILE = # work around python distutils compiling C++ with $CC |