From 1f2a18d9163f75c1001a04157f195557b0c24f8a Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Fri, 8 Sep 2017 21:24:14 +0300 Subject: protobuf: remove old versions This leaves only protobuf3_1 which is the last version with libprotobuf2. Also fix several packages to build with the latest protobuf. --- pkgs/applications/networking/cluster/mesos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkgs/applications/networking/cluster') diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 4c9753c1aac6..16ef657111fd 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -73,7 +73,7 @@ in stdenv.mkDerivation rec { substituteInPlace 3rdparty/stout/Makefile.am \ --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a" + "${pythonProtobuf.protobuf}/lib/libprotobuf.so" substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \ --subst-var-by sh ${bash}/bin/bash @@ -101,7 +101,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/python/native_common/ext_modules.py.in \ --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a" + "${pythonProtobuf.protobuf}/lib/libprotobuf.so" substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \ --subst-var-by cp ${coreutils}/bin/cp \ @@ -126,7 +126,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/Makefile.am \ --subst-var-by mavenRepo ${mavenRepo} \ --replace "-lprotobuf" \ - "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a" + "${pythonProtobuf.protobuf}/lib/libprotobuf.so" '' + lib.optionalString stdenv.isLinux '' -- cgit 1.4.1