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

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/mail/opensmtpd/extras.nix
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, openssl, libevent, libasr,
python2, pkgconfig, lua5, perl, libmysqlclient, postgresql, sqlite, hiredis,
python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
enablePython ? true,
enableLua ? true,
enablePerl ? true,
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ openssl libevent
libasr python2 lua5 perl libmysqlclient postgresql sqlite hiredis ];
libasr python2 lua5 perl mysql.connector-c postgresql sqlite hiredis ];
configureFlags = [
"--sysconfdir=/etc"
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
stdenv.lib.optional enableRedis
"-I${hiredis}/include/hiredis -lhiredis"
++ stdenv.lib.optional enableMysql
"-L${libmysqlclient}/lib/mysql";
"-L${mysql.connector-c}/lib/mysql";
meta = with stdenv.lib; {
homepage = https://www.opensmtpd.org/;