From 618c0519850e9416c788b563bb86939cb9e44baa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 22 Apr 2015 16:03:20 -0700 Subject: [PATCH] bareos: Use libmysql instead of mysql --- pkgs/tools/backup/bareos/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 9994030ada9..57ca79a00a2 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool , readline ? null, openssl ? null, python ? null, ncurses ? null -, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null +, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null , acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: -assert sqlite != null || postgresql != null || mysql != null; +assert sqlite != null || postgresql != null || libmysql != null; with stdenv.lib; let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig nettools gettext readline openssl python - ncurses sqlite postgresql mysql.lib zlib lzo acl glusterfs libceph libcap + ncurses sqlite postgresql libmysql zlib lzo acl glusterfs libceph libcap ]; postPatch = '' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (mysql != null) "--with-mysql=${mysql.lib}" + ++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (zlib != null) "--with-zlib=${zlib}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (acl != null) "--enable-acl"