Author: eelco
Date: Wed Apr 6 11:41:36 2011
New Revision: 26711
URL: https://svn.nixos.org/websvn/nix/?rev=26711&sc=1
Log:
* ssmtp updated to 2.64. Also get rid of the cyclic symlink $out/lib/sendmail.
Modified:
nixpkgs/trunk/pkgs/tools/networking/ssmtp/default.nix
Modified: nixpkgs/trunk/pkgs/tools/networking/ssmtp/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/networking/ssmtp/default.nix Wed Apr 6
11:02:41 2011 (r26710)
+++ nixpkgs/trunk/pkgs/tools/networking/ssmtp/default.nix Wed Apr 6
11:41:36 2011 (r26711)
@@ -3,29 +3,27 @@
assert tlsSupport -> openssl != null;
stdenv.mkDerivation {
- name = "ssmtp-2.61-12";
+ name = "ssmtp-2.64";
+
src = fetchurl {
- url =
http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61.orig.tar.gz;
- sha256 =
"2151ad18cb73f9a254f796dde2b48be7318b45410b59fedbb258db5a41044fb5";
+ url =
http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2;
+ sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2";
};
- patches = [
- (fetchurl {
- url =
http://ftp.debian.org/debian/pool/main/s/ssmtp/ssmtp_2.61-12.diff.gz;
- sha256 =
"2eb5b2af76d220f14e5133ec4078bab531209fb2f9f8f4e780a0ab8de4818d39";
- })
- ];
- configureFlags = "${if tlsSupport then "--enable-ssl" else ""}";
- postConfigure = "
- sed -e '/INSTALLED_CONFIGURATION_FILE/d' \\
- -e 's|\\(DSSMTPCONFDIR.*\\).(.*)\\(.*$\\)|\\1/etc/ssmtp\\2|' \\
- -e
's|\\(DCONFIGURATION_FILE.*\\).(.*)\\(.*$\\)|\\1/etc/ssmtp/ssmtp.conf\\2|' \\
- -e
's|\\(DREVALIASES_FILE.*\\).(.*)\\(.*$\\)|\\1/etc/ssmtp/revaliases\\2|' \\
- -e \"s| /lib| $out/lib|\" -i Makefile
- substituteInPlace ssmtp.c --replace gnutls/ openssl/ --replace openssl.h
ssl.h
- substituteInPlace Makefile --replace /usr/lib/libgnutls-openssl.so -lssl
- ";
- preInstall = "ensureDir $out/lib";
+
+ configureFlags = "--sysconfdir=/etc ${if tlsSupport then "--enable-ssl" else
""}";
+
+ postConfigure =
+ ''
+ # Don't run the script that interactively generates a config file.
+ # Also don't install the broken, cyclic symlink /lib/sendmail.
+ sed -e '/INSTALLED_CONFIGURATION_FILE/d' \
+ -e 's|/lib/sendmail|$(TMPDIR)/sendmail|' \
+ -i Makefile
+ '';
+
+ installFlags = "etcdir=$(out)/etc";
+
installTargets = [ "install" "install-sendmail" ];
- postInstall = "install ssmtp.conf $out/etc/ssmtp ";
+
buildInputs = stdenv.lib.optional tlsSupport openssl;
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
