treewide: Make explicit that 'dev' output of openssl is used
This commit is contained in:
committed by
Vladimír Čunát
parent
5eb01cd0ad
commit
2a73de6e6c
@@ -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}'"
|
||||
'';
|
||||
|
||||
|
||||
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
|
||||
"--enable-scsi-crypto"
|
||||
] ++ optionals (readline != null) [ "--disable-conio" "--enable-readline" "--with-readline=${readline}" ]
|
||||
++ optional (python != null) "--with-python=${python}"
|
||||
++ optional (openssl != null) "--with-openssl=${openssl}"
|
||||
++ optional (openssl != null) "--with-openssl=${openssl.dev}"
|
||||
++ optional (sqlite != null) "--with-sqlite3=${sqlite}"
|
||||
++ optional (postgresql != null) "--with-postgresql=${postgresql}"
|
||||
++ optional (libmysql != null) "--with-mysql=${libmysql}"
|
||||
|
||||
@@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec {
|
||||
]);
|
||||
|
||||
preConfigure = ''
|
||||
export BORG_OPENSSL_PREFIX="${openssl}"
|
||||
export BORG_OPENSSL_PREFIX="${openssl.dev}"
|
||||
export BORG_LZ4_PREFIX="${lz4}"
|
||||
'';
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user