From fb12dbce4988877e5e0c8ef3dec3ec89bc733984 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Fri, 3 Jan 2025 11:13:41 +0200 Subject: [PATCH] build/cargo: Use system libsodium by default. * gnu/packages/cargo-build-system.scm (configure): Add an environment variable to default to using the system libsodium package. Change-Id: If4c7de018a60ae5e3fd96e64590acfbc46731d04 --- guix/build/cargo-build-system.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/guix/build/cargo-build-system.scm b/guix/build/cargo-build-system.scm index 480134402f..065401aa3a 100644 --- a/guix/build/cargo-build-system.scm +++ b/guix/build/cargo-build-system.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Mathieu Othacehe ;;; Copyright © 2019 Ivan Petkov -;;; Copyright © 2019-2024 Efraim Flashner +;;; Copyright © 2019-2025 Efraim Flashner ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2024 Maxim Cournoyer @@ -207,6 +207,7 @@ directory = '" vendor-dir "'") port) (setenv "LIBGIT2_SYS_USE_PKG_CONFIG" "1") (setenv "LIBSSH2_SYS_USE_PKG_CONFIG" "1") + (setenv "SODIUM_USE_PKG_CONFIG" "1") (setenv "ZSTD_SYS_USE_PKG_CONFIG" "1") (when (assoc-ref inputs "openssl") (setenv "OPENSSL_DIR" (assoc-ref inputs "openssl")))