From: Maxime Devos <maximedevos@telenet.be>
To: 57864@debbugs.gnu.org
Cc: arun isaac <arunisaac@systemreboot.net>
Subject: bug#57864: rust-zstd-sys bundles zstd
Date: Fri, 16 Sep 2022 18:47:22 +0200 [thread overview]
Message-ID: <8a25ff33-1376-7053-2f5c-1bb88343d86f@telenet.be> (raw)
In-Reply-To: <48c7a7a1-666c-acf1-5f9f-704842d308e6@telenet.be>
[-- Attachment #1.1.1: Type: text/plain, Size: 1808 bytes --]
Solved as follows in antioxidant (i.e., enable the 'pkg-config' feature
and remove the local copy in a snippet).
diff --git a/antioxidant-packages.scm b/antioxidant-packages.scm
index e851bc9..b0296e7 100644
--- a/antioxidant-packages.scm
+++ b/antioxidant-packages.scm
@@ -4708,6 +4708,7 @@ RFC-compliant `EmailAddress` newtype. ")
;; rust-num-bigint-dig's zeroize feature requires the "derive"
;; feature of rust-zeroize
("rust-zeroize" ,#~'("default" "derive"))
+ ("rust-zstd-sys" ,#~'("default" "pkg-config" "non-cargo"))
("rust-zip" ,#~'("bzip2" "deflate" "time" "zstd")))) ; avoid
default "aes-crypto" feature, which requiers an ol
(define %replacements
@@ -5748,6 +5749,8 @@ RFC-compliant `EmailAddress` newtype. ")
(("rust-parking-lot" ,(p rust-parking-lot-0.11)))) ; test input
("rust-zip" ; new inputs for new version
(("rust-zstd" ,(p rust-zstd-0.9))))
+ ("rust-zstd-sys"
+ (("zstd:lib" ,(@ (gnu packages compression) zstd) "lib")))
("sniffglue" (("rust-bstr" ,(@ (gnu packages crates-io)
rust-bstr-0.2))))))
(define %no-parallel-tests?
@@ -6628,6 +6631,14 @@ RFC-compliant `EmailAddress` newtype. ")
(inherit (package-source pack))
(modules '((guix build utils)))
(snippet #~(delete-file-recursively "source"))))
+ ("rust-zstd-sys"
+ ;; Unbundle zstd
+ (origin
+ (inherit (package-source pack))
+ (modules '((guix build utils)))
+ (snippet #~(begin
+ (delete-file-recursively "zstd")
+ (delete-file "zstd.h")))))
("rust-itoa"
(origin
(inherit (package-source pack))
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 929 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
next prev parent reply other threads:[~2022-09-16 16:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-16 14:58 bug#57864: rust-zstd-sys bundles zstd Maxime Devos
2022-09-16 16:47 ` Maxime Devos [this message]
2022-09-25 18:54 ` Arun Isaac
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8a25ff33-1376-7053-2f5c-1bb88343d86f@telenet.be \
--to=maximedevos@telenet.be \
--cc=57864@debbugs.gnu.org \
--cc=arunisaac@systemreboot.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).