diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-22 12:09:23 +0200 |
commit | c4661e96434118637a5c41511a6c7f015726396f (patch) | |
tree | edd7a4026fd903cddfb32b27f629af7f5c110fa8 /pkgs/tools/backup | |
parent | bfd522da633bd904918a939b29f0a0ebb594fa6b (diff) | |
parent | c02f0ade90c2ba28063dc21a8cbdad50b777f403 (diff) |
Merge: make dev output references explicit
This is a rebase of most commits from #14766, resolving conflicts and a few other evaluation problems.
Diffstat (limited to 'pkgs/tools/backup')
-rw-r--r-- | pkgs/tools/backup/attic/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/bacula/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/backup/borg/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/backup/partimage/default.nix | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix index 4f659428c00a3..a639dbb2fd290 100644 --- a/pkgs/tools/backup/attic/default.nix +++ b/pkgs/tools/backup/attic/default.nix @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec { [ cython msgpack openssl acl llfuse ]; preConfigure = '' - export ATTIC_OPENSSL_PREFIX="${openssl}" + export ATTIC_OPENSSL_PREFIX="${openssl.dev}" substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'" ''; diff --git a/pkgs/tools/backup/bacula/default.nix b/pkgs/tools/backup/bacula/default.nix index 8d586e5cb1f3e..374122814c50d 100644 --- a/pkgs/tools/backup/bacula/default.nix +++ b/pkgs/tools/backup/bacula/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (!stdenv.isDarwin) acl; configureFlags = [ - "--with-sqlite3=${sqlite}" + "--with-sqlite3=${sqlite.dev}" "--with-postgresql=${postgresql}" ]; diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 5a7c35e460fe2..cf44d0e9c26d4 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" diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix index 95c0c26f30be1..e736583a084cd 100644 --- a/pkgs/tools/backup/borg/default.nix +++ b/pkgs/tools/backup/borg/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { ]); preConfigure = '' - export BORG_OPENSSL_PREFIX="${openssl}" + export BORG_OPENSSL_PREFIX="${openssl.dev}" export BORG_LZ4_PREFIX="${lz4}" ''; diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix index 37d99a115f8b4..e73e71da51a20 100644 --- a/pkgs/tools/backup/partimage/default.nix +++ b/pkgs/tools/backup/partimage/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { url = mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2; sha256 = "0db6xiphk6xnlpbxraiy31c5xzj0ql6k4rfkmqzh665yyj0nqfkm"; }; - configureFlags = "--with-ssl-headers=${openssl}/include/openssl"; + configureFlags = "--with-ssl-headers=${openssl.dev}/include/openssl"; buildInputs = [bzip2 zlib newt newt openssl pkgconfig slang # automake autoconf libtool gettext |