aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2022-12-12 16:41:57 +0100
committerMarius Bakke <marius@gnu.org>2022-12-12 20:23:31 +0100
commit999783b92d549dfd53a305ad744fcc0048fa2479 (patch)
tree82d9fb721e56791721a407c458df7ee0010588e3 /gnu
parent3640310d6965598e37a6a32363d23b2755a95e8a (diff)
downloadguix-999783b92d549dfd53a305ad744fcc0048fa2479.tar.gz
guix-999783b92d549dfd53a305ad744fcc0048fa2479.zip
gnu: ungoogled-chromium: Build with ffmpeg@4.
This is a follow-up to commit 79564bf9977ebba0b31d8dc291eb039142f51f68. * gnu/packages/chromium.scm (ungoogled-chromium)[inputs]: Change from FFMPEG to FFFMPEG-4.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/chromium.scm2
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 983a754215..299a4edcbe 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -899,7 +899,7 @@
dbus
expat
flac
- ffmpeg
+ ffmpeg-4
fontconfig
fp16
freetype
all to 'make-file-writable'. Catch 'system-error' around 'rename-file'. (deduplicate): Pass #:swap-directory and remove uses of 'false-if-system-error'. * tests/store-deduplication.scm ("deduplicate"): Add 'chmod' call. Ludovic Courtès 2018-06-14deduplicate: Fix a couple of thinkos....* guix/store/deduplication.scm (get-temp-link): Turn 'args' in the 'catch' handler into a rest argument. (deduplicate): Use 'lstat' instead of 'file-is-directory?' to properly handle symlinks. When iterating over the result of 'scandir', exclude the ".links" sub-directory. * tests/store-deduplication.scm ("deduplicate"): Create sub-directories and call 'deduplicate' directly on STORE. Ludovic Courtès 2018-06-01Add (guix store deduplication)....* guix/store/database.scm (register-path): Add #:deduplicate? and call 'deduplicate' when it's true. (counting-wrapper-port, nar-sha256): Move to... * guix/store/deduplication.scm: ... here. New file. * tests/store-deduplication.scm: New file. * Makefile.am (STORE_MODULES): Add deduplication.scm. (SCM_TESTS) [HAVE_GUILE_SQLITE3]: Add store-deduplication.scm. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Caleb Ristvedt