diff options
author | Robin Gloster <mail@glob.in> | 2017-07-26 13:12:37 +0200 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2017-07-26 13:32:59 +0200 |
commit | 4a787b292abe90c02975849b98c308ebb9b87ad8 (patch) | |
tree | 26fa3dff93bafdf1de7d8a6450fb468c6741651d | |
parent | 100107a3cd166da87b527eabf49f477ea2d18c9f (diff) | |
download | nixpkgs-4a787b292abe90c02975849b98c308ebb9b87ad8.tar nixpkgs-4a787b292abe90c02975849b98c308ebb9b87ad8.tar.gz nixpkgs-4a787b292abe90c02975849b98c308ebb9b87ad8.tar.bz2 nixpkgs-4a787b292abe90c02975849b98c308ebb9b87ad8.tar.lz nixpkgs-4a787b292abe90c02975849b98c308ebb9b87ad8.tar.xz nixpkgs-4a787b292abe90c02975849b98c308ebb9b87ad8.tar.zst nixpkgs-4a787b292abe90c02975849b98c308ebb9b87ad8.zip |
mailutils: clean up and fix last test
-rw-r--r-- | pkgs/tools/networking/mailutils/default.nix | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 82d581650bb..aee5302405a 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gettext libtool pkgconfig ] ++ stdenv.lib.optional doCheck dejagnu; - buildInputs = [ gdbm pam readline ncurses gnutls guile texinfo gnum4 sasl fribidi nettools gss mysql.lib @@ -26,7 +25,8 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "${p}/mailutils-3.2-fix-build.patch"; + url = "https://git.savannah.gnu.org/cgit/mailutils.git/patch/?id=afbb33cf9ff"; + excludes = [ "NEWS" ]; sha256 = "0yzkfx3j1zkkb43fhchjqphw4xznbclj39bjzjggv32gppy6d1db"; }) ./fix-build-mb-len-max.patch @@ -34,6 +34,16 @@ stdenv.mkDerivation rec { ./path-to-cat.patch ]; + doCheck = true; + enableParallelBuilding = true; + hardeningDisable = [ "format" ]; + + configureFlags = [ + "--with-gssapi" + "--with-gsasl" + "--with-mysql" + ]; + readmsg-tests = stdenv.lib.optionals doCheck [ (fetchurl { url = "${p}/hdr.at"; sha256 = "0phpkqyhs26chn63wjns6ydx9468ng3ssbjbfhcvza8h78jlsd98"; }) (fetchurl { url = "${p}/nohdr.at"; sha256 = "1vkbkfkbqj6ml62s1am8i286hxwnpsmbhbnq0i2i0j1i7iwkk4b7"; }) @@ -48,11 +58,6 @@ stdenv.mkDerivation rec { */Makefile{.in,.am} ''; - configureFlags = [ - "--with-gssapi" - "--with-mysql" - ]; - preCheck = '' # Add missing files. cp ${builtins.toString readmsg-tests} readmsg/tests/ @@ -61,16 +66,16 @@ stdenv.mkDerivation rec { done # Disable comsat tests that fail without tty in the sandbox. tty -s || echo > comsat/tests/testsuite.at + # Disable lmtp tests that require root spool. + echo > maidag/tests/lmtp.at # Disable mda tests that require /etc/passwd to contain root. grep -qo '^root:' /etc/passwd || echo > maidag/tests/mda.at # Provide libraries for mhn. export LD_LIBRARY_PATH=$(pwd)/lib/.libs ''; - postCheck = "unset LD_LIBRARY_PATH"; - - doCheck = true; - enableParallelBuilding = true; - hardeningDisable = [ "format" ]; + postCheck = '' + unset LD_LIBRARY_PATH + ''; meta = with stdenv.lib; { description = "Rich and powerful protocol-independent mail framework"; |