diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-07-18 08:29:53 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-07-18 08:29:53 +0200 |
| commit | 250922fd1e061f2132d33b778424f4e9ed42354a (patch) | |
| tree | c26970f54a01d8d612c82818de8d2104172b9fa0 /pkgs/development/python-modules/protobuf/default.nix | |
| parent | 0ff0b14968e7474fbb917fbb096a8d89d121922f (diff) | |
| parent | 950a258b9ef24ca4346bbf722a694c2ab54e4654 (diff) | |
| download | nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.gz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.bz2 nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.lz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.xz nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.tar.zst nixpkgs-250922fd1e061f2132d33b778424f4e9ed42354a.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/python-modules/protobuf/default.nix')
| -rw-r--r-- | pkgs/development/python-modules/protobuf/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/protobuf/default.nix b/pkgs/development/python-modules/protobuf/default.nix index 30e9fbf9ea7..ee1d0bbffb5 100644 --- a/pkgs/development/python-modules/protobuf/default.nix +++ b/pkgs/development/python-modules/protobuf/default.nix @@ -19,7 +19,12 @@ buildPythonPackage { doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. + propagatedNativeBuildInputs = let + protobufVersion = "${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}"; + in [ + buildPackages."protobuf${protobufVersion}" # For protoc of the same version. + ]; + nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ]; buildInputs = [ protobuf ]; |