From 29fc0daa27c927ae5692be574a36c87d56946a2c Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 20 Feb 2015 11:17:08 -0800
Subject: [PATCH] protobuf: Mark as disabled on py3k and fix python executable
 references

---
 pkgs/top-level/python-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b95e1fe15c..591cfec9d89 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7527,6 +7527,7 @@ let
   protobuf2_5 = self.protobufBuild pkgs.protobuf2_5;
   protobufBuild = protobuf: buildPythonPackage rec {
     inherit (protobuf) name src;
+    disabled = isPy3k;
 
     propagatedBuildInputs = with self; [ protobuf google_apputils ];
 
@@ -7543,9 +7544,9 @@ let
     '';
 
     checkPhase = if versionAtLeast protobuf.version "2.6.0" then ''
-      python setup.py google_test --cpp_implementation
+      ${python.executable} setup.py google_test --cpp_implementation
     '' else ''
-      python setup.py test
+      ${python.executable} setup.py test
     '';
 
     installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation";