diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:37:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-27 15:58:40 +0200 |
| commit | e4832c754114c5660909546ac749475bf63ff06e (patch) | |
| tree | fe77400566603caa218453ad5c7b6b9b5ea9715c /pkgs/tools/backup/bareos/default.nix | |
| parent | 60a890e35bc94ace092a2ec278534979fe6ee361 (diff) | |
| parent | dc13593b9fad3ea3728e2fd32f90841d5ec7662d (diff) | |
| download | nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.gz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.bz2 nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.lz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.xz nixlib-e4832c754114c5660909546ac749475bf63ff06e.tar.zst nixlib-e4832c754114c5660909546ac749475bf63ff06e.zip | |
Merge branch 'staging'
Includes a security update of libxml2.
Diffstat (limited to 'pkgs/tools/backup/bareos/default.nix')
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 5a7c35e460fe..cf44d0e9c26d 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -50,13 +50,13 @@ stdenv.mkDerivation rec { "--enable-dynamic-cats-backends" "--enable-sql-pooling" "--enable-scsi-crypto" - ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline}" ] + ] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline.dev}" ] ++ optional (python != null) "--with-python=${python}" - ++ optional (openssl != null) "--with-openssl=${openssl}" - ++ optional (sqlite != null) "--with-sqlite3=${sqlite}" + ++ 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}" - ++ optional (zlib != null) "--with-zlib=${zlib}" + ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" ++ optional (acl != null) "--enable-acl" |