Merge pull request #38468 from veprbl/mesos_darwin

mesos: fix on darwin by disabling java interface
This commit is contained in:
Daiderd Jordan
2018-04-06 20:19:16 +02:00
committed by GitHub
3 changed files with 25 additions and 15 deletions

View File

@@ -15,7 +15,12 @@ stdenv.mkDerivation rec {
make all leveldbutil libmemenv.a
'';
installPhase = "
installPhase = (stdenv.lib.optionalString stdenv.isDarwin ''
for file in *.dylib*; do
install_name_tool -id $out/lib/$file $file
done
'') + # XXX consider removing above after transition to cmake in the next release
"
mkdir -p $out/{bin,lib,include}
cp -r include $out

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, findutils
{ stdenv, fetchurl, findutils, fixDarwinDylibNames
, sslSupport? true, openssl
}:
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
buildInputs = []
++ stdenv.lib.optional sslSupport openssl
++ stdenv.lib.optional stdenv.isCygwin findutils
++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames
;
postInstall = stdenv.lib.optionalString sslSupport ''