From a1b384783e3d20689a0328fce4f7ae69a35b1090 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 8 Aug 2013 03:14:00 +0200 Subject: [PATCH] chromium: Fix build for version 28 and NSS 3.15. Build failure details: http://hydra.nixos.org/build/5663358 Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 8188d5279a7..d2c48bc5c7c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -135,6 +135,9 @@ in stdenv.mkDerivation rec { sed -i -e 's|/usr/bin/gcc|gcc|' third_party/WebKit/Source/core/core.gypi '' + optionalString useOpenSSL '' cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + '' + optionalString (versionOlder sourceInfo.version "29.0.0.0") '' + sed -i -e '/struct SECItemArray/,/^};/d' \ + net/third_party/nss/ssl/bodge/secitem_array.c ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // {