From d711528c8bbf36c91675a56365cf3c7578cea557 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 31 Mar 2015 05:36:28 +0000
Subject: [PATCH] pythonPackages: notmuch: revert 6258728, move sourceRoot
 setting to top-level notmuch

Looks like this is the only way to do what 6258728318fe55faef64285e614fe97edc7b9111
was expected to do that doesn't break things and doesn't look like a complete hack.

The problem is that different `fetch`ers generate very different results (from
archive files to plain source trees) and allowing overriding `src` in top-level
derivation when there is a derived python package is no trivial matter.
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 ++++
 pkgs/top-level/python-packages.nix                           | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 43e04ed8a396..4304520383e0 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -7,6 +7,10 @@
 stdenv.mkDerivation rec {
   name = "notmuch-0.19";
 
+  passthru = {
+    pythonSourceRoot = "${name}/bindings/python";
+  };
+
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
     sha256 = "1szf6c44g209pcjq5nvfhlp3nzcm3lrcwv4spsxmwy13hiaccvrr";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d94481a524c2..3b301cecd34b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7075,7 +7075,7 @@ let
 
     src = pkgs.notmuch.src;
 
-    sourceRoot = "${pkgs.notmuch.src.name}/bindings/python";
+    sourceRoot = pkgs.notmuch.pythonSourceRoot;
 
     buildInputs = with self; [ python pkgs.notmuch ];