summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRenaud <c0bw3b@users.noreply.github.com>2019-05-11 17:25:41 +0200
committerGitHub <noreply@github.com>2019-05-11 17:25:41 +0200
commit8660acf856bcba2d2f5559637e62d5ecc50aae59 (patch)
tree045134dd9852d59350bbcd532b7f3541849e78d7 /pkgs
parent725a100c73566eea2bd34ca8613d4da824e05824 (diff)
parenta6febf3eaa9353727a0d824023119682d0518499 (diff)
downloadnixpkgs-8660acf856bcba2d2f5559637e62d5ecc50aae59.tar
nixpkgs-8660acf856bcba2d2f5559637e62d5ecc50aae59.tar.gz
nixpkgs-8660acf856bcba2d2f5559637e62d5ecc50aae59.tar.bz2
nixpkgs-8660acf856bcba2d2f5559637e62d5ecc50aae59.tar.lz
nixpkgs-8660acf856bcba2d2f5559637e62d5ecc50aae59.tar.xz
nixpkgs-8660acf856bcba2d2f5559637e62d5ecc50aae59.tar.zst
nixpkgs-8660acf856bcba2d2f5559637e62d5ecc50aae59.zip
Merge pull request #60188 from risicle/ris-mesos-fix
mesos: fix build by forcing protobuf 3.6
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/top-level/all-packages.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a2d5784d0a..2ef2b6b5940 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8226,7 +8226,7 @@ in
   mesos = callPackage ../applications/networking/cluster/mesos {
     sasl = cyrus_sasl;
     inherit (pythonPackages) python boto setuptools wrapPython;
-    pythonProtobuf = pythonPackages.protobuf;
+    pythonProtobuf = pythonPackages.protobuf.override { protobuf = protobuf3_6; };
     perf = linuxPackages.perf;
   };