mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-01-06 21:13:40 +00:00
571c71e6f7
We are migrating packages that meet below requirements:
1. using `callPackage`
2. called path is a directory
3. overriding set is empty (`{ }`)
4. not containing path expressions other than relative path (to
makenixpkgs-vet happy)
5. not referenced by nix files outside of the directory, other
than`pkgs/top-level/all-packages.nix`
6. not referencing nix files outside of the directory
7. not referencing `default.nix` (since it's changed to `package.nix`)
8. `outPath` doesn't change after migration
The tool is here: https://github.com/Aleksanaa/by-name-migrate.
24 lines
987 B
Diff
24 lines
987 B
Diff
diff --git a/configure.ac b/configure.ac
|
|
index fb8db11e9e..4c40683057 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -766,14 +766,10 @@ AS_IF([test "x$enable_fuse_notifications" != "xno"], [
|
|
|
|
dnl Find out OpenSSL trusted certificates path
|
|
AC_MSG_CHECKING([for OpenSSL trusted certificates path])
|
|
-SSL_CERT_PATH=$(openssl version -d | sed -e 's|OPENSSLDIR: "\(.*\)".*|\1|')
|
|
-if test -d "${SSL_CERT_PATH}" 1>/dev/null 2>&1; then
|
|
- AC_MSG_RESULT([$SSL_CERT_PATH])
|
|
- AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.])
|
|
- AC_SUBST(SSL_CERT_PATH)
|
|
-else
|
|
- AC_MSG_ERROR([Unable to detect path to OpenSSL trusted certificates])
|
|
-fi
|
|
+SSL_CERT_PATH=/etc/ssl
|
|
+AC_MSG_RESULT([$SSL_CERT_PATH])
|
|
+AC_DEFINE_UNQUOTED(SSL_CERT_PATH, ["$SSL_CERT_PATH"], [Path to OpenSSL trusted certificates.])
|
|
+AC_SUBST(SSL_CERT_PATH)
|
|
|
|
AC_CHECK_LIB([ssl], TLS_method, [HAVE_OPENSSL_1_1="yes"], [HAVE_OPENSSL_1_1="no"])
|
|
if test "x$HAVE_OPENSSL_1_1" = "xyes"; then
|