diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2017-09-08 21:24:14 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2017-09-09 05:54:43 +0300 |
| commit | 1f2a18d9163f75c1001a04157f195557b0c24f8a (patch) | |
| tree | af5e9c92e375151ac241cca80e035d726f28f1ef /pkgs/applications/networking | |
| parent | 4bdcb220c9c9d965d37d3e18c5dcb10ef2605d22 (diff) | |
| download | nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.gz nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.bz2 nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.lz nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.xz nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.tar.zst nixlib-1f2a18d9163f75c1001a04157f195557b0c24f8a.zip | |
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.
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/cluster/mesos/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
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 '' |