From 14961c87810330d22fc1ee11e11a17e32805ff8b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 Oct 2015 10:40:41 -0700 Subject: [PATCH] v8: Fix compilation issue with gcc4.9+ --- pkgs/development/libraries/v8/3.16.14.nix | 4 ++++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/v8/3.16.14.nix b/pkgs/development/libraries/v8/3.16.14.nix index ba3aae5cf70..c79357cd907 100644 --- a/pkgs/development/libraries/v8/3.16.14.nix +++ b/pkgs/development/libraries/v8/3.16.14.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { sha256 = "1gpf2xvhxfs5ll3m2jlslsx9jfjbmrbz55iq362plflrvf8mbxhj"; }; + postPatch = '' + sed -i 's/-Werror//' build/standalone.gypi build/common.gypi + ''; + configurePhase = stdenv.lib.optionalString stdenv.isDarwin '' ln -s /usr/bin/xcodebuild $TMPDIR export PATH=$TMPDIR:$PATH diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd865a4a25f..79862d8613a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8340,7 +8340,6 @@ let v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix { inherit (pythonPackages) gyp; - stdenv = overrideCC stdenv gcc48; }; v8_3_24_10 = callPackage ../development/libraries/v8/3.24.10.nix {