Skip to content

pythonPackages.protobuf: fix cross-compilation #99141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FRidh merged 1 commit into from
Oct 25, 2020
Merged

pythonPackages.protobuf: fix cross-compilation #99141

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkgs/development/python-modules/protobuf/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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 ];

Expand All @@ -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")
Expand Down