aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2023-02-19 12:43:52 +0200
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2023-03-24 13:31:34 -0400
commit95c1c16a29f01d44f3401d1644fe2cf88b8758ae (patch)
treeec12d9beb5d224be1820e903e01b8491b9e61b4e
parent839bb4616f13171a23ad7937bf57d0a01d61d42a (diff)
downloadguix-95c1c16a29f01d44f3401d1644fe2cf88b8758ae.tar.gz
guix-95c1c16a29f01d44f3401d1644fe2cf88b8758ae.zip
gnu: rav1e: Fix building.
* gnu/packages/video.scm (rav1e)[source]: Remove outdated snippet. [arguments]: Remove custom 'force-rust-edition-2018 phase.
-rw-r--r--gnu/packages/video.scm15
1 files changed, 2 insertions, 13 deletions
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index d4d3a8f5b9..93a2425932 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -5289,12 +5289,7 @@ result in several formats:
(string-append name "-" version ".tar.gz"))
(sha256
(base32
- "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn"))
- (modules '((guix build utils)))
- (snippet
- '(substitute* "Cargo.toml"
- (("\\[package\\]" m)
- (string-append "cargo-features = [\"rust-version\"]\n" m))))))
+ "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn"))))
(build-system cargo-build-system)
(arguments
`(;; Strip the '--release' flag to work around the doctest failures with
@@ -5357,14 +5352,8 @@ result in several formats:
(add-after 'unpack 'relax-versions
(lambda _
(substitute* "Cargo.toml"
- ;; Allow using more recent versions of
+ ;; Allow using more recent versions of system-deps.
(("~3.1.2") "~3"))))
- (add-after 'configure 'force-rust-edition-2018
- (lambda* (#:key vendor-dir #:allow-other-keys)
- ;; Force all the dependencies to not be higher than edition 2018.
- (with-fluids ((%default-port-encoding #f))
- (substitute* (find-files vendor-dir "Cargo.toml")
- (("edition = \\\"2021\\\"") "edition = \"2018\"")))))
(replace 'build
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))