guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

40/45: gnu: p11-kit-next: Switch to meson-build-system.


From: guix-commits
Subject: 40/45: gnu: p11-kit-next: Switch to meson-build-system.
Date: Fri, 17 Feb 2023 10:49:42 -0500 (EST)

cbaines pushed a commit to branch master
in repository guix.

commit 95f481b33167cd231fda080c76eb980550fd1eae
Author: Vivien Kraus <vivien@planete-kraus.eu>
AuthorDate: Fri Jan 6 23:48:21 2023 +0100

    gnu: p11-kit-next: Switch to meson-build-system.
    
    README.md says to use meson to build.
    
    * gnu/packages/tls.scm (p11-kit-next)[build-system]: Use meson-build-system.
    [arguments]: Adjust accordingly.
    
    Signed-off-by: Christopher Baines <mail@cbaines.net>
---
 gnu/packages/tls.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 9eaa859a57..59e0e28feb 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -51,6 +51,7 @@
   #:use-module (guix build-system python)
   #:use-module (guix build-system cmake)
   #:use-module (guix build-system trivial)
+  #:use-module (guix build-system meson)
   #:use-module ((guix search-paths) #:select ($SSL_CERT_DIR $SSL_CERT_FILE))
   #:use-module (gnu packages compression)
   #:use-module (gnu packages)
@@ -207,12 +208,16 @@ living in the same process.")
                            "download/" version "/p11-kit-" version ".tar.xz"))
        (sha256
         (base32 "1y5fm9gwhkh902r26p90qf1g2h1ziqrk4hgf9i9sxm2wzlz7ignq"))))
+    (build-system meson-build-system)
     (arguments
      ;; Use the default certificates so that users such as flatpak find them.
      ;; See <https://issues.guix.gnu.org/49957>.
      (substitute-keyword-arguments (package-arguments p11-kit)
        ((#:configure-flags flags ''())
-        ''("--with-trust-paths=/etc/ssl/certs/ca-certificates.crt"))))))
+        ''("-Dtrust_paths=/etc/ssl/certs/ca-certificates.crt"))
+       ;; p11-kit is still on gnu-build-system.
+       ((#:phases gnu-phases)
+        '%standard-phases)))))
 
 (define-public gnutls
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]