diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-02 19:10:45 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-01-02 19:10:45 +0100 |
| commit | 804285f589ded484b530750dd1ec03b9052bcdac (patch) | |
| tree | 8b20955e293215e1b8d672a3fd38867c39484609 /pkgs/tools/backup | |
| parent | 63c1a54257a5cef15b926c0843b3c7557c6f9a24 (diff) | |
| parent | 4cc2a38854338ba783fb867ff924200b59867773 (diff) | |
| download | nixlib-804285f589ded484b530750dd1ec03b9052bcdac.tar nixlib-804285f589ded484b530750dd1ec03b9052bcdac.tar.gz nixlib-804285f589ded484b530750dd1ec03b9052bcdac.tar.bz2 nixlib-804285f589ded484b530750dd1ec03b9052bcdac.tar.lz nixlib-804285f589ded484b530750dd1ec03b9052bcdac.tar.xz nixlib-804285f589ded484b530750dd1ec03b9052bcdac.tar.zst nixlib-804285f589ded484b530750dd1ec03b9052bcdac.zip | |
Merge remote-tracking branch 'upstream/staging' into HEAD
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/backup/mydumper/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index c32567138322..4af20f76449a 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, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb -, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null +, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: -assert sqlite != null || postgresql != null || libmysql != null; +assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; let @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettools gettext readline openssl python2 flex ncurses sqlite postgresql - libmysql zlib lzo jansson acl glusterfs libceph libcap rocksdb + mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb ]; postPatch = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (libmysql != null) "--with-mysql=${libmysql.dev}" + ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 5b1f8f3fd5cb..da8805bc226e 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glib, zlib, pcre, mariadb, libressl, }: +, glib, zlib, pcre, mysql, libressl }: stdenv.mkDerivation rec { version = "0.9.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glib zlib pcre mariadb.client.dev libressl ]; + buildInputs = [ glib zlib pcre mysql.connector-c libressl ]; meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; |