diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-09-09 09:27:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-09 09:27:10 +0200 |
| commit | 6589ee83c2264d88ea3277186e239039e8818aae (patch) | |
| tree | d03bb8b46d7c083ef0e153a05f847a4bb96fbbfe /pkgs/applications/networking/cluster | |
| parent | 79770136ffa7de3c9a3f6e05d41a42224d9e2d95 (diff) | |
| parent | 1f2a18d9163f75c1001a04157f195557b0c24f8a (diff) | |
| download | nixlib-6589ee83c2264d88ea3277186e239039e8818aae.tar nixlib-6589ee83c2264d88ea3277186e239039e8818aae.tar.gz nixlib-6589ee83c2264d88ea3277186e239039e8818aae.tar.bz2 nixlib-6589ee83c2264d88ea3277186e239039e8818aae.tar.lz nixlib-6589ee83c2264d88ea3277186e239039e8818aae.tar.xz nixlib-6589ee83c2264d88ea3277186e239039e8818aae.tar.zst nixlib-6589ee83c2264d88ea3277186e239039e8818aae.zip | |
Merge pull request #29134 from abbradar/protobuf
Update protobuf and remove old versions
Diffstat (limited to 'pkgs/applications/networking/cluster')
| -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 '' |