mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-14 08:31:40 +03:00
Merge pull request #225110 from amjoseph-nixpkgs/pr/notmuch/gmime3
This commit is contained in:
commit
1cd2bb9162
@ -1,6 +1,6 @@
|
||||
{ fetchurl, lib, stdenv
|
||||
, pkg-config, gnupg
|
||||
, xapian, gmime, talloc, zlib
|
||||
, xapian, gmime3, talloc, zlib
|
||||
, doxygen, perl, texinfo
|
||||
, notmuch
|
||||
, pythonPackages
|
||||
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
buildInputs = [
|
||||
gnupg # undefined dependencies
|
||||
xapian gmime talloc zlib # dependencies described in INSTALL
|
||||
xapian gmime3 talloc zlib # dependencies described in INSTALL
|
||||
perl
|
||||
pythonPackages.python
|
||||
] ++ lib.optional withRuby ruby;
|
||||
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
|
||||
ln -s ${test-database} test/test-databases/database-v1.tar.xz
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime.version "3.0.3");
|
||||
doCheck = !stdenv.hostPlatform.isDarwin && (lib.versionAtLeast gmime3.version "3.0.3");
|
||||
checkTarget = "test";
|
||||
nativeCheckInputs = [
|
||||
which dtach openssl bash
|
||||
|
@ -32625,7 +32625,6 @@ with pkgs;
|
||||
notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
|
||||
|
||||
notmuch = callPackage ../applications/networking/mailreaders/notmuch {
|
||||
gmime = gmime3;
|
||||
pythonPackages = python3Packages;
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user