Merge pull request #56834 from matthewbauer/v8-update
v8: 5.4.232 -> 7.4.255
This commit is contained in:
@@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
|
||||
install -vD out/gn "$out/bin/gn"
|
||||
'';
|
||||
|
||||
setupHook = ./setup-hook.sh;
|
||||
|
||||
meta = with lib; {
|
||||
description = "A meta-build system that generates NinjaBuild files";
|
||||
homepage = https://gn.googlesource.com/gn;
|
||||
|
||||
14
pkgs/development/tools/build-managers/gn/setup-hook.sh
Normal file
14
pkgs/development/tools/build-managers/gn/setup-hook.sh
Normal file
@@ -0,0 +1,14 @@
|
||||
gnConfigurePhase() {
|
||||
runHook preConfigure
|
||||
|
||||
echo "gn flags: $gnFlags ${gnFlagsArray[@]}"
|
||||
|
||||
gn gen out/Release --args="$gnFlags ${gnFlagsArray[@]}"
|
||||
cd out/Release/
|
||||
|
||||
runHook postConfigure
|
||||
}
|
||||
|
||||
if [ -z "$dontUseGnConfigure" -a -z "$configurePhase" ]; then
|
||||
configurePhase=gnConfigurePhase
|
||||
fi
|
||||
@@ -3,7 +3,7 @@
|
||||
, runtimeShell, callPackage
|
||||
, xcodePlatform ? stdenv.targetPlatform.xcodePlatform or "MacOSX"
|
||||
, xcodeVer ? stdenv.targetPlatform.xcodeVer or "9.4.1"
|
||||
, sdkVer ? stdenv.targetPlatform.sdkVer or "10.10" }:
|
||||
, sdkVer ? stdenv.targetPlatform.sdkVer or "10.12" }:
|
||||
|
||||
let
|
||||
|
||||
@@ -107,6 +107,9 @@ runCommand "xcodebuild-${xcbuild.version}" {
|
||||
ln -s ${platforms} $out/Platforms
|
||||
ln -s ${toolchains} $out/Toolchains
|
||||
|
||||
mkdir -p $out/Applications/Xcode.app/Contents
|
||||
ln -s $out $out/Applications/Xcode.app/Contents/Developer
|
||||
|
||||
makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \
|
||||
--add-flags "-xcconfig ${xcconfig}" \
|
||||
--add-flags "DERIVED_DATA_DIR=." \
|
||||
@@ -116,7 +119,7 @@ runCommand "xcodebuild-${xcbuild.version}" {
|
||||
--run '[ "$1" = "-license" ] && exit 0'
|
||||
|
||||
substitute ${xcode-select} $out/bin/xcode-select \
|
||||
--subst-var-by DEVELOPER_DIR $out
|
||||
--subst-var-by DEVELOPER_DIR $out/Applications/Xcode.app/Contents/Developer
|
||||
chmod +x $out/bin/xcode-select
|
||||
|
||||
substitute ${xcrun} $out/bin/xcrun
|
||||
|
||||
Reference in New Issue
Block a user