diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2019-03-03 05:03:13 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-03-03 08:07:56 +0100 |
| commit | f20a66084fde224cc06451c7f8aa6d3f2a42859c (patch) | |
| tree | 406814ab18b215fc8c528a01e9e1b99ac98c94af | |
| parent | 16c74f7eea1f17aad67d8b023e98709c56a72ae4 (diff) | |
| download | nixlib-f20a66084fde224cc06451c7f8aa6d3f2a42859c.tar nixlib-f20a66084fde224cc06451c7f8aa6d3f2a42859c.tar.gz nixlib-f20a66084fde224cc06451c7f8aa6d3f2a42859c.tar.bz2 nixlib-f20a66084fde224cc06451c7f8aa6d3f2a42859c.tar.lz nixlib-f20a66084fde224cc06451c7f8aa6d3f2a42859c.tar.xz nixlib-f20a66084fde224cc06451c7f8aa6d3f2a42859c.tar.zst nixlib-f20a66084fde224cc06451c7f8aa6d3f2a42859c.zip | |
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
| -rw-r--r-- | pkgs/development/python-modules/protobuf/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index bfccdabd7596..4f00537db0c8 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 |