colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #225110 from amjoseph-nixpkgs/pr/notmuch/gmime3

Browse Source
This commit is contained in:
Artturi 2023-04-13 21:21:20 +03:00 committed by GitHub
commit 1cd2bb9162
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/mailreaders/notmuch/default.nix
View File

@ -1,6 +1,6 @@
{ fetchurl, lib, stdenv { fetchurl, lib, stdenv
, pkg-config, gnupg , pkg-config, gnupg
, xapian, gmime, talloc, zlib , xapian, gmime3, talloc, zlib
, doxygen, perl, texinfo , doxygen, perl, texinfo
, notmuch , notmuch
, pythonPackages , pythonPackages
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gnupg # undefined dependencies gnupg # undefined dependencies
xapian gmime talloc zlib # dependencies described in INSTALL xapian gmime3 talloc zlib # dependencies described in INSTALL
perl perl
pythonPackages.python pythonPackages.python
] ++ lib.optional withRuby ruby; ] ++ lib.optional withRuby ruby;
@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
ln -s ${test-database} test/test-databases/database-v1.tar.xz 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"; checkTarget = "test";
nativeCheckInputs = [ nativeCheckInputs = [
which dtach openssl bash which dtach openssl bash

1
pkgs/top-level/all-packages.nix
View File

@ -32625,7 +32625,6 @@ with pkgs;
notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { }; notepadqq = libsForQt5.callPackage ../applications/editors/notepadqq { };
notmuch = callPackage ../applications/networking/mailreaders/notmuch { notmuch = callPackage ../applications/networking/mailreaders/notmuch {
gmime = gmime3;
pythonPackages = python3Packages; pythonPackages = python3Packages;
}; };