From 76a9bad380111493b5a1422485f941de799c6c90 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Fri, 11 Jun 2021 23:14:47 +0200 Subject: gnu: libressl: Remove search paths. Unlike OpenSSL, LibreSSL hardcode it's certificate bundle and doesn't allow to specify it through a environment variable. * gnu/packages/tls.scm (libressl)[configure-flags]: Specify OpenSSL configuration directory. [native-search-paths]: Remove it. * gnu/packages/ntp.scm (openntpd)[configure-flags]: Adjust CAcert location. --- gnu/packages/ntp.scm | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ntp.scm') diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index b86def1929..ed852f94cf 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2019 Maxim Cournoyer ;;; Copyright © 2021 Marius Bakke +;;; Copyright © 2021 Brice Waegeneire ;;; ;;; This file is part of GNU Guix. ;;; @@ -187,11 +188,14 @@ computers over a network.") "0ijsylc7a4jlpxsqa0jq1w1c7333id8pcakzl7a5749ria1xp0l5")))) (build-system gnu-build-system) (arguments - '(#:configure-flags `( "--with-privsep-user=ntpd" - "--localstatedir=/var" - ,(string-append "--with-cacert=" - (assoc-ref %build-inputs "libressl") - "/etc/ssl/cert.pem")) + `(#:configure-flags + (let* ((libressl (assoc-ref %build-inputs "libressl")) + (libressl-version ,(package-version libressl))) + (list "--with-privsep-user=ntpd" + "--localstatedir=/var" + (string-append "--with-cacert=" libressl + "/share/libressl-" libressl-version + "/cert.pem"))) #:phases (modify-phases %standard-phases (add-after 'unpack 'modify-install-locations -- cgit v1.2.3 From d65bd74411ab4820318311062b0f327b139a5784 Mon Sep 17 00:00:00 2001 From: Brice Waegeneire Date: Thu, 17 Jun 2021 08:28:14 +0200 Subject: gnu: openntpd: Get libressl version from the inputs. * gnu/packages/ntp.scm (openntpd)[arguments]: Get libressl version from the package inputs. --- gnu/packages/ntp.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ntp.scm') diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index ed852f94cf..191eedd158 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -190,7 +190,9 @@ computers over a network.") (arguments `(#:configure-flags (let* ((libressl (assoc-ref %build-inputs "libressl")) - (libressl-version ,(package-version libressl))) + (libressl-version ,(package-version + (car (assoc-ref (package-inputs this-package) + "libressl"))))) (list "--with-privsep-user=ntpd" "--localstatedir=/var" (string-append "--with-cacert=" libressl -- cgit v1.2.3