Merge pull request #38468 from veprbl/mesos_darwin
mesos: fix on darwin by disabling java interface
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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 ''
|
||||
|
||||
Reference in New Issue
Block a user