diff options
| author | Marius Bakke <marius@gnu.org> | 2022-12-28 01:02:47 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2022-12-28 01:02:47 +0100 |
| commit | ec0fbb471dfc6f72796da9ebafbb0630daa91267 (patch) | |
| tree | 3b42f3d0a6470d85fbb8421179634bb278883e4e /gnu/packages/emulators.scm | |
| parent | f5ef7d34e4deecb80aff585c108b0a2ab1f33ce4 (diff) | |
| parent | 0cb8f7125b19264b01962c1249c3df4c5ce85aa9 (diff) | |
| download | guix-ec0fbb471dfc6f72796da9ebafbb0630daa91267.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/emulators.scm')
| -rw-r--r-- | gnu/packages/emulators.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5054ae3da5..11d1cda46f 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -323,7 +323,7 @@ console.") bluez curl eudev - ffmpeg + ffmpeg-4 font-wqy-microhei freetype glew @@ -1471,7 +1471,7 @@ as RetroArch.") "--disable-builtinminiupnpc"))))))) (inputs `(("alsa-lib" ,alsa-lib) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-4) ("freetype" ,freetype) ("libxinerama" ,libxinerama) ("libxkbcommon" ,libxkbcommon) @@ -2035,7 +2035,7 @@ assembler, and debugger for the Intel 8085 microprocessor. (list libcdio sdl2 gtk+ - ffmpeg + ffmpeg-4 libxv libarchive pulseaudio)) @@ -2322,7 +2322,7 @@ elseif(FALSE)")) (native-inputs (list pkg-config python)) (inputs (list bash cityhash - ffmpeg + ffmpeg-4 glew glslang libpng |