summary refs log tree commit diff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2023-01-06 23:48:21 +0100
committerChristopher Baines <mail@cbaines.net>2023-02-17 15:44:58 +0000
commit95f481b33167cd231fda080c76eb980550fd1eae (patch)
tree2792c64cb53c4ebf26a6de6e287c38aa4cf0cb5f
parent48724a66422e02995e62e2f707dcd9087d43bee5 (diff)
downloadguix-95f481b33167cd231fda080c76eb980550fd1eae.tar.gz
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>
-rw-r--r--gnu/packages/tls.scm7
1 files changed, 6 insertions, 1 deletions
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