TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gnu: rav1e: Fix building.

Browse source 
* gnu/packages/video.scm (rav1e)[source]: Remove outdated snippet.
[arguments]: Remove custom 'force-rust-edition-2018 phase.
This commit is contained in:
Efraim Flashner 2023-02-19 12:43:52 +02:00 committed by Maxim Cournoyer
parent 6d9597088d
commit aee59d5af7
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/video.scm
View file

@ -5286,12 +5286,7 @@ (define-public rav1e
(string-append name "-" version ".tar.gz")) (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn")) "006bfcmjwg0phg8gc25b1sl2ngjrb2bh1b3fd0s5gbf9nlkr8qsn"))))
(modules '((guix build utils)))
(snippet
'(substitute* "Cargo.toml"
(("\\[package\\]" m)
(string-append "cargo-features = [\"rust-version\"]\n" m))))))
(build-system cargo-build-system) (build-system cargo-build-system)
(arguments (arguments
`(;; Strip the '--release' flag to work around the doctest failures with `(;; Strip the '--release' flag to work around the doctest failures with
@ -5354,14 +5349,8 @@ (define-public rav1e
(add-after 'unpack 'relax-versions (add-after 'unpack 'relax-versions
(lambda _ (lambda _
(substitute* "Cargo.toml" (substitute* "Cargo.toml"
;; Allow using more recent versions of ;; Allow using more recent versions of system-deps.
(("~3.1.2") "~3")))) (("~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 (replace 'build
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))