guix-commits
[Top][All Lists]
Advanced

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

139/281: gnu: rav1e: Fix building.


From: guix-commits
Subject: 139/281: gnu: rav1e: Fix building.
Date: Wed, 22 Feb 2023 05:41:01 -0500 (EST)

efraim pushed a commit to branch rust-team
in repository guix.

commit dabee5766a0387dee24c6bc9d6f327ebe5a57976
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Feb 19 12:43:52 2023 +0200

    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 fcbafdb846..6189ee5c2d 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -5321,12 +5321,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
@@ -5389,14 +5384,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")))



reply via email to

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