b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #112622 from bobrik/ivan/python-protobuf-no-flags

Browse source 
pythonPackages.protobuf: remove no longer useful NIX_CFLAGS_COMPILE
This commit is contained in:
Sandro 2021-02-16 04:26:54 +01:00 committed by GitHub
parent 0547c59412 631aeb11cf
commit 479caef3ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/python-modules/protobuf/default.nix
View file

@ -20,12 +20,6 @@ buildPythonPackage {
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
NIX_CFLAGS_COMPILE = toString (
# work around python distutils compiling C++ with $CC
lib.optional stdenv.isDarwin "-I${libcxx}/include/c++/v1"
++ lib.optional (lib.versionOlder protobuf.version "2.7.0") "-std=c++98"
);
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ];