From ea6f4b29f2499cedaa78adfb983087b5d461b293 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Wed, 16 Nov 2016 20:56:56 +0300 Subject: nixpkgs 16.09: updated icinga2 --- modules/pkgs/icinga2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules') diff --git a/modules/pkgs/icinga2/default.nix b/modules/pkgs/icinga2/default.nix index 5429a51..35f6ab1 100644 --- a/modules/pkgs/icinga2/default.nix +++ b/modules/pkgs/icinga2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , bison, boost, cmake, flex -, libedit, mysql, openssl, yajl +, libedit, mariadb, openssl, yajl }: stdenv.mkDerivation rec { @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { "-DICINGA2_RUNDIR=/run" "-DICINGA2_USER=icinga" "-DICINGA2_WITH_PGSQL=OFF" - "-DMYSQL_INCLUDE_DIR=${mysql.lib}/include/mysql" - "-DMYSQL_LIB_DIR=${mysql.lib}/lib" + "-DMYSQL_INCLUDE_DIR=${mariadb.client.dev}/include/mysql" + "-DMYSQL_LIB_DIR=${mariadb.client.out}/lib" ]; # XXX Without DESTDIR it tries to write to /icinga2 and /run: -- cgit v1.2.3