mesos: fix for different protobuf outputs vs master

globin · globin · commit 3011e9348603 · 2017-09-28T21:05:01.000+02:00
diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -69,7 +69,7 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace 3rdparty/stout/Makefile.am \
       --replace "-lprotobuf" \
-                "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
+                "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
 
     substituteInPlace 3rdparty/stout/include/stout/os/posix/fork.hpp \
       --subst-var-by sh ${bash}/bin/bash
@@ -97,7 +97,7 @@ in stdenv.mkDerivation rec {
 
     substituteInPlace src/python/native_common/ext_modules.py.in \
       --replace "-lprotobuf" \
-                "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
+                "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
 
     substituteInPlace src/slave/containerizer/mesos/isolators/gpu/volume.cpp \
       --subst-var-by cp    ${coreutils}/bin/cp \
@@ -122,7 +122,7 @@ in stdenv.mkDerivation rec {
     substituteInPlace src/Makefile.am \
       --subst-var-by mavenRepo ${mavenRepo} \
       --replace "-lprotobuf" \
-                "${pythonProtobuf.protobuf}/lib/libprotobuf.a"
+                "${pythonProtobuf.protobuf.lib}/lib/libprotobuf.a"
 
   '' + lib.optionalString stdenv.isLinux ''
 
