From aee59d5af7e5759fb8201e63624d438b4bd118f6 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 19 Feb 2023 12:43:52 +0200 Subject: [PATCH] gnu: rav1e: Fix building. * gnu/packages/video.scm (rav1e)[source]: Remove outdated snippet. [arguments]: Remove custom 'force-rust-edition-2018 phase. --- gnu/packages/video.scm | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 9f3aa998b2..8ecbaa2602 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -5286,12 +5286,7 @@ (define-public rav1e (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 @@ -5354,14 +5349,8 @@ (define-public rav1e (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")))