nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-01 19:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

pythonPackages.protobuf: fix cross-compilation

Browse Source
This commit is contained in:
Ben Wolsieffer 2020-09-30 00:30:17 -04:00
parent 372884ffa5
commit 5642ee3d0e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/python-modules/protobuf/default.nix
View File

@ -1,11 +1,11 @@
{ stdenv, fetchpatch, python, buildPythonPackage, isPy37
{ buildPackages, stdenv, fetchpatch, python, buildPythonPackage, isPy37
, protobuf, google_apputils, pyext, libcxx, isPy27
, disabled, doCheck ? true }:
with stdenv.lib;
buildPythonPackage {
inherit (protobuf) name src version;
inherit (protobuf) pname src version;
inherit disabled;
doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2
@ -15,8 +15,10 @@ buildPythonPackage {
++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"
);
outputs = [ "out" "dev" ];
propagatedBuildInputs = [ google_apputils ];
propagatedNativeBuildInputs = [ protobuf ]; # For protoc.
propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc.
nativeBuildInputs = [ google_apputils pyext ];
buildInputs = [ protobuf ];
@ -43,9 +45,9 @@ buildPythonPackage {
preBuild = ''
# Workaround for https://github.com/google/protobuf/issues/2895
${python.interpreter} setup.py build
${python.pythonForBuild.interpreter} setup.py build
'' + optionalString (versionAtLeast protobuf.version "2.6.0") ''
${python.interpreter} setup.py build_ext --cpp_implementation
${python.pythonForBuild.interpreter} setup.py build_ext --cpp_implementation
'';
installFlags = optional (versionAtLeast protobuf.version "2.6.0")