From b26de392522176b9a176eb21bb5be4a5ac8d9062 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 May 2015 11:37:40 +0200
Subject: [PATCH] gyp: Revive old SVN version to build Chromium.

Works around regression from a305e6855dd8723683c77635f45ae28411c8f36c.

We're also marking it lowPrio to make sure nobody will accidentally
reference it using nix-env -i.

Until we have fixed #7402, we're going to build with the old gyp version
to prevent being affected by https://crbug.com/462153.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/common.nix   |  2 +-
 pkgs/top-level/python-packages.nix            | 22 +++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 247a27ca37b..3d85afef8f4 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -113,7 +113,7 @@ let
       glib gtk dbus_glib
       libXScrnSaver libXcursor libXtst mesa
       pciutils protobuf speechd libXdamage
-      pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2
+      pythonPackages.gyp_svn1977 pythonPackages.ply pythonPackages.jinja2
     ] ++ optional gnomeKeyringSupport libgnome_keyring3
       ++ optionals gnomeSupport [ gnome.GConf libgcrypt ]
       ++ optional enableSELinux libselinux
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d6e25e339e..a6472829d23 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5833,6 +5833,28 @@ let
     };
   };
 
+  # Needed to build Chromium until #7402 is fixed.
+  gyp_svn1977 = pkgs.lowPrio (buildPythonPackage rec {
+    rev = "1977";
+    name = "gyp-r${rev}";
+
+    src = pkgs.fetchsvn {
+      url = "http://gyp.googlecode.com/svn/trunk";
+      inherit rev;
+      sha256 = "0vnr75yd3bidysiwl9lljvf1dv6v9m9xqdnx0hdgyl92w689n9j8";
+    };
+
+    patches = optionals pkgs.stdenv.isDarwin [
+      ../development/python-modules/gyp/no-darwin-cflags.patch
+    ];
+
+    meta = {
+      homepage = http://code.google.com/p/gyp;
+      license = stdenv.lib.licenses.bsd3;
+      description = "Generate Your Projects";
+    };
+  });
+
   guessit = buildPythonPackage rec {
     version = "0.9.4";
     name = "guessit-${version}";