From f20a66084fde224cc06451c7f8aa6d3f2a42859c Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 3 Mar 2019 05:03:13 +0100 Subject: [PATCH] pythonPackages.protobuf: propagate native pkgs.protobuf input Python packages depending on the protobuf library often use the "protoc" tool from pkgs.protobuf to codegen at build time. This fixes a few regressions from 5c7531872fb55f42b03df9929f60cfb410cf7cc5 --- pkgs/development/python-modules/protobuf/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index bfccdabd759..4f00537db0c 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -14,7 +14,8 @@ buildPythonPackage rec { ++ optional (versionOlder protobuf.version "2.7.0") "-std=c++98"; propagatedBuildInputs = [ google_apputils ]; - nativeBuildInputs = [ google_apputils pyext protobuf ]; + propagatedNativeBuildInputs = [ protobuf ]; # For protoc. + nativeBuildInputs = [ google_apputils pyext ]; buildInputs = [ protobuf ]; patches = optional isPy37