diff options
| author | ajs124 <git@ajs124.de> | 2021-06-21 16:21:41 +0200 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-06-21 20:23:26 +0000 |
| commit | c466620ad2c70caedd2bb12a56546ff05bf2f63c (patch) | |
| tree | fe97265a1d4cea8f44aac5001e76702e3188dac8 | |
| parent | dovecot_pigeonhole: add myself as maintainer (diff) | |
| download | nixpkgs-c466620ad2c70caedd2bb12a56546ff05bf2f63c.tar.gz | |
dovecout: fix systemd unit dir
the configure flag we were using was dropped in
https://github.com/dovecot/core/commit/a42bb363b4ab475ced72fada57cc3e1de8b05bca
(cherry picked from commit 5fa6e9c403940c7c641356daf9c7ac05e464f58f)
| -rw-r--r-- | pkgs/servers/mail/dovecot/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index f58d65d9f16e..d5fb9e7ed6ee 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { preConfigure = '' patchShebangs src/config/settings-get.pl - ''; + '' + lib.optionalString (stdenv.isLinux) "export systemdsystemunitdir=$out/etc/systemd/system"; # We need this for sysconfdir, see remark below. installFlags = [ "DESTDIR=$(out)" ]; @@ -75,8 +75,8 @@ stdenv.mkDerivation rec { "lib_cv_va_copy=yes" "lib_cv___va_copy=yes" "lib_cv_va_val_copy=yes" - ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ++ lib.optional (stdenv.isDarwin) "--enable-static" + ] ++ lib.optional stdenv.isLinux "--with-systemd" + ++ lib.optional stdenv.isDarwin "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite"; |