diff options
| author | Domen Kožar <domen@dev.si> | 2015-04-01 07:14:25 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-04-01 07:14:25 +0200 |
| commit | 06a810659c32bb21f17528ce9594c0081ceb5971 (patch) | |
| tree | 2a185f620fd26eb1498d0472fe50207cb93a5eea /pkgs | |
| parent | bb363dd2f20ce6a5bd39498a3ec379dd031117d9 (diff) | |
| parent | d711528c8bbf36c91675a56365cf3c7578cea557 (diff) | |
| download | nixlib-06a810659c32bb21f17528ce9594c0081ceb5971.tar nixlib-06a810659c32bb21f17528ce9594c0081ceb5971.tar.gz nixlib-06a810659c32bb21f17528ce9594c0081ceb5971.tar.bz2 nixlib-06a810659c32bb21f17528ce9594c0081ceb5971.tar.lz nixlib-06a810659c32bb21f17528ce9594c0081ceb5971.tar.xz nixlib-06a810659c32bb21f17528ce9594c0081ceb5971.tar.zst nixlib-06a810659c32bb21f17528ce9594c0081ceb5971.zip | |
Merge pull request #7102 from oxij/fix-fixed-notmuch
pythonPackages: notmuch: revert 6258728, move sourceRoot setting to top-level
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/mailreaders/notmuch/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 5 insertions, 1 deletions
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 f3dade7d0f9b..97a3c76b02ad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7077,7 +7077,7 @@ let src = pkgs.notmuch.src; - sourceRoot = "${pkgs.notmuch.src.name}/bindings/python"; + sourceRoot = pkgs.notmuch.pythonSourceRoot; buildInputs = with self; [ python pkgs.notmuch ]; |