[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
207/416: gnu: rav1e: Fix building.
From: |
guix-commits |
Subject: |
207/416: gnu: rav1e: Fix building. |
Date: |
Fri, 14 Apr 2023 15:25:55 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit aee59d5af7e5759fb8201e63624d438b4bd118f6
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 9f3aa998b2..8ecbaa2602 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -5286,12 +5286,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
@@ -5354,14 +5349,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")))
- 187/416: gnu: fluidsynth: Update to 2.3.1., (continued)
- 187/416: gnu: fluidsynth: Update to 2.3.1., guix-commits, 2023/04/14
- 189/416: gnu: speex: Update to 1.2.1., guix-commits, 2023/04/14
- 190/416: gnu: ibus-minimal: Move Python support to ibus., guix-commits, 2023/04/14
- 183/416: gnu: rust-utf-8-0.7: Update to 0.7.6., guix-commits, 2023/04/14
- 191/416: gnu: ibus-minimal: Disable GTK 2 support., guix-commits, 2023/04/14
- 192/416: gnu: gstreamer: Do not reference Python., guix-commits, 2023/04/14
- 194/416: gnu: Add rust-cargon-0.0., guix-commits, 2023/04/14
- 203/416: gnu: Add rust-os-info-3., guix-commits, 2023/04/14
- 205/416: gnu: Add rust-cbindgen-0.20., guix-commits, 2023/04/14
- 206/416: gnu: rust-cargo: Update to 0.60.0., guix-commits, 2023/04/14
- 207/416: gnu: rav1e: Fix building.,
guix-commits <=
- 209/416: NEWS: Mention new rpm format., guix-commits, 2023/04/14
- 214/416: gnu: gst-plugins-bad: Update to 1.22.1 and reinstate a few tests., guix-commits, 2023/04/14
- 215/416: gnu: gst-plugins-ugly: Update to 1.22.1., guix-commits, 2023/04/14
- 216/416: gnu: gst-libav: Update to 1.22.1., guix-commits, 2023/04/14
- 220/416: gnu: ffmpeg-5: Rename variable to ffmpeg., guix-commits, 2023/04/14
- 212/416: gnu: gst-plugins-base: Update to 1.22.1., guix-commits, 2023/04/14
- 221/416: gnu: ffmpeg: Update to 6.0., guix-commits, 2023/04/14
- 229/416: gnu: qt3d-5: Update to 5.15.8., guix-commits, 2023/04/14
- 234/416: gnu: qtdeclarative-5: Update to 5.15.8., guix-commits, 2023/04/14
- 245/416: gnu: qtlocation: Update to 5.15.5., guix-commits, 2023/04/14