public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge: make dev output references explicit

Browse Source 
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
This commit is contained in:
Vladimír Čunát
2016-05-22 12:09:23 +02:00
parent bfd522da63 c02f0ade90
commit c4661e9643
199 changed files with 308 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/backup/attic/default.nix
+1 -1
View File
@@ -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}'"
'';
pkgs/tools/backup/bacula/default.nix
+1 -1
View File
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (!stdenv.isDarwin) acl;
configureFlags = [
"--with-sqlite3=${sqlite}"
"--with-sqlite3=${sqlite.dev}"
"--with-postgresql=${postgresql}"
];
pkgs/tools/backup/bareos/default.nix
+4 -4
View File
@@ -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"
pkgs/tools/backup/borg/default.nix
+1 -1
View File
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
]);
preConfigure = ''
export BORG_OPENSSL_PREFIX="${openssl}"
export BORG_OPENSSL_PREFIX="${openssl.dev}"
export BORG_LZ4_PREFIX="${lz4}"
'';
pkgs/tools/backup/partimage/default.nix
+1 -1
View File
@@ -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