From b27932a65b4f59fea29375e8a11649700371884e Mon Sep 17 00:00:00 2001 From: Johannes Bornhold Date: Wed, 2 Nov 2016 23:29:31 +0100 Subject: [PATCH] v8-3_16_14 tweaks for the build on darwin The build was originally failing due to a missing libtool. Trying to add the buildInput "libtool" did not work out, since a few command line arguments are not supported. I've applied the same workaround as for "xcodebuild". The second change is about the install step, where the path of "libv8.dylib" was just slightly different. --- pkgs/development/libraries/v8/3.16.14.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index d9addab3030..91a8763d43f 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' ln -s /usr/bin/xcodebuild $TMPDIR + ln -s /usr/bin/libtool $TMPDIR export PATH=$TMPDIR:$PATH '' + '' PYTHONPATH="tools/generate_shim_headers:$PYTHONPATH" \ @@ -57,8 +58,8 @@ stdenv.mkDerivation rec { installPhase = '' install -vD out/Release/d8 "$out/bin/d8" - ${if stdenv.system == "x86_64-darwin" then '' - install -vD out/Release/lib.target/libv8.dylib "$out/lib/libv8.dylib" + ${if stdenv.isDarwin then '' + install -vD out/Release/libv8.dylib "$out/lib/libv8.dylib" '' else '' install -vD out/Release/lib.target/libv8.so "$out/lib/libv8.so" ''}