diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-01-12 01:00:12 +0000 |
| commit | eeaf5d25d5f6ae7ae1f5bf8a3dee4559693f8147 (patch) | |
| tree | afc41ca8dde96b41089ca324533084aef570322f /nixpkgs/pkgs/development/python-modules/protobuf | |
| parent | 63c4c4dda49dc69e5812faa7ef8406180998f3ae (diff) | |
| parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
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 73216f63f82..e414dff8aa1 100644 --- a/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -9,10 +9,11 @@ buildPythonPackage { inherit disabled; doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 - NIX_CFLAGS_COMPILE = + NIX_CFLAGS_COMPILE = toString ( # work around python distutils compiling C++ with $CC optional stdenv.isDarwin "-I${libcxx}/include/c++/v1" - ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; + ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98" + ); propagatedBuildInputs = [ google_apputils ]; propagatedNativeBuildInputs = [ protobuf ]; # For protoc. |