From 1ae4db3a80b7cd35bb9ea17464893b56664b17f9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Apr 2014 03:18:38 +0200
Subject: [PATCH] chromium: Fix build of stable channel.

Build failure on Hydra:

https://hydra.nixos.org/build/9823160

This was caused by the update of file in 5885709.

As file seems to be used for only one substition in the gyp files, we
can now drop the build dependency on file and patch out the substition
expression, as it is done before actually testing if the value has been
set by -D (gyp, y u no have lazy eval!?).

PS: Proudly untested against beta and dev channels, redeployed my own
Hydra and building on my workstation here really is ... annoying (lavg
41 on a system with nproc 8, less than 8 GB RAM and you probably will
have as much "fun" as I just had writing this commit mess...a....g

FUCK^H^H^H^H^H^H...e).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index df5c2bff0d3f..c4040ec0356c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -8,7 +8,7 @@
 , libusb1, libexif, pciutils
 
 , python, pythonPackages, perl, pkgconfig
-, nspr, udev, krb5, file
+, nspr, udev, krb5
 , utillinux, alsaLib
 , gcc, bison, gperf
 , glib, gtk, dbus_glib
@@ -54,6 +54,7 @@ let
       sed -i -r \
         -e 's/-f(stack-protector)(-all)?/-fno-\1/' \
         -e 's|/bin/echo|echo|' \
+        -e "/python_arch/s/: *'[^']*'/: '""'/" \
         build/common.gypi
       sed -i '/not RunGN/,+1d' build/gyp_chromium
       sed -i -e 's|/usr/bin/gcc|gcc|' \
@@ -165,8 +166,7 @@ in stdenv.mkDerivation rec {
     nspr udev
     (if useOpenSSL then openssl else nss)
     utillinux alsaLib
-    gcc bison gperf
-    krb5 file
+    gcc bison gperf krb5
     glib gtk dbus_glib
     libXScrnSaver libXcursor libXtst mesa
     pciutils protobuf speechd libXdamage
@@ -223,8 +223,10 @@ in stdenv.mkDerivation rec {
     ffmpeg_branding = "Chrome";
   } // optionalAttrs (stdenv.system == "x86_64-linux") {
     target_arch = "x64";
+    python_arch = "x86-64";
   } // optionalAttrs (stdenv.system == "i686-linux") {
     target_arch = "ia32";
+    python_arch = "ia32";
   });
 
   configurePhase = ''