From 2024e08564ece8ba332d52b88a44d89b525a8124 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 11 Feb 2015 10:21:51 +0100
Subject: [PATCH] partially fix pythonPackages.protobuf

---
 pkgs/development/libraries/protobuf/2.5.nix     | 1 +
 pkgs/development/libraries/protobuf/2.6.nix     | 1 +
 pkgs/development/libraries/protobuf/generic.nix | 2 +-
 pkgs/top-level/python-packages.nix              | 5 ++---
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/protobuf/2.5.nix b/pkgs/development/libraries/protobuf/2.5.nix
index 4cc6a68c9f2..9d7bb38cf3c 100644
--- a/pkgs/development/libraries/protobuf/2.5.nix
+++ b/pkgs/development/libraries/protobuf/2.5.nix
@@ -2,6 +2,7 @@
 
 callPackage ./generic.nix (args // rec {
   version = "2.5.0";
+  # make sure you test also -A pythonPackages.protobuf
   src = fetchurl {
     url = "http://protobuf.googlecode.com/files/${version}.tar.bz2";
     sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk";
diff --git a/pkgs/development/libraries/protobuf/2.6.nix b/pkgs/development/libraries/protobuf/2.6.nix
index 72960b0dd6a..49ed9d9ade1 100644
--- a/pkgs/development/libraries/protobuf/2.6.nix
+++ b/pkgs/development/libraries/protobuf/2.6.nix
@@ -2,6 +2,7 @@
 
 callPackage ./generic.nix (args // rec {
   version = "2.6.1";
+  # make sure you test also -A pythonPackages.protobuf
   src = fetchFromGitHub {
     owner = "google";
     repo = "protobuf";
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index 003ea703517..929621204a0 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -4,7 +4,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "protobuf-${version}";
+  name = "protobuf-v${version}";
 
   inherit src;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5901a51c93e..edec3a537be 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7489,9 +7489,8 @@ let
   protobuf = buildPythonPackage rec {
     inherit (pkgs.protobuf) name src;
 
-    propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils  ];
-    sourceRoot = "${name}/python";
-
+    propagatedBuildInputs = with self; [ pkgs.protobuf google_apputils ];
+    sourceRoot = "${name}-src/python";
 
     meta = {
       description = "Protocol Buffers are Google's data interchange format";