diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-01 17:46:30 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-07 20:46:37 +0200 |
| commit | 950feb70b2e43e300bd0f285eb6e3ad446ca0722 (patch) | |
| tree | f245993b24df468364c224dc9f3a3b29cb2539f4 /pkgs/servers | |
| parent | 9a072482e69ab90c09ce2ca464a4316fb07c4a45 (diff) | |
| download | nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.gz nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.bz2 nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.lz nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.xz nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.zst nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.zip | |
treewide: fixup various mysql ocurrences after re-split
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/mail/dspam/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/mail/postfix/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/restund/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix index 1ac47fbf7224..6f52e62aab75 100644 --- a/pkgs/servers/mail/dspam/default.nix +++ b/pkgs/servers/mail/dspam/default.nix @@ -49,7 +49,7 @@ in stdenv.mkDerivation rec { "--enable-preferences-extension" "--enable-long-usernames" "--enable-external-lookup" - ] ++ lib.optional withMySQL "--with-mysql-includes=${libmysql}/include/mysql" + ] ++ lib.optional withMySQL "--with-mysql-includes=${lib.getDev libmysql}/include/mysql" ++ lib.optional withPgSQL "--with-pgsql-libraries=${postgresql.lib}/lib"; # Lots of things are hardwired to paths like sysconfdir. That's why we install with both "prefix" and "DESTDIR" diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 008c8c90d1be..99371f41b0f1 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -11,7 +11,7 @@ let "-DHAS_DB_BYPASS_MAKEDEFS_CHECK" "-fPIE" "-fstack-protector-all" "--param" "ssp-buffer-size=4" "-O2" "-D_FORTIFY_SOURCE=2" ] ++ lib.optional withPgSQL "-DHAS_PGSQL" - ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${libmysql}/include/mysql" ] + ++ lib.optionals withMySQL [ "-DHAS_MYSQL" "-I${lib.getDev libmysql}/include/mysql" ] ++ lib.optional withSQLite "-DHAS_SQLITE"); auxlibs = lib.concatStringsSep " " ([ "-ldb" "-lnsl" "-lresolv" "-lsasl2" "-lcrypto" "-lssl" "-pie" "-Wl,-z,relro,-z,now" diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index 8a831f7ff697..acca1af60550 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; - NIX_LDFLAGS='' -L${mysql.lib}/lib/mysql ''; + NIX_LDFLAGS='' -L${stdenv.lib.getLib mysql.client}/lib/mysql ''; meta = { homepage = "http://www.creytiv.com/restund.html"; platforms = with stdenv.lib.platforms; linux; |