diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-04-30 04:03:54 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-04-30 04:03:54 -0400 |
| commit | 3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc (patch) | |
| tree | ee7dce4e436490a1db5f18e4bfad55511d2fff32 /gnu/packages/gnunet.scm | |
| parent | c77835db04ee20c0afe20600dc8f91a67bc2421e (diff) | |
| parent | 8c21c64e59d3f4d223d8aeef91f06fdde7de1ab7 (diff) | |
| download | guix-3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc.tar guix-3d5ad159b336a9903b31d0be7ae052dbc8d5bfcc.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gnunet.scm')
| -rw-r--r-- | gnu/packages/gnunet.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index 939bdf9148..c74ccc9229 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -88,7 +88,7 @@ `(("exiv2" ,exiv2) ("bzip2" ,bzip2) ("flac" ,flac) - ("ffmpeg" ,ffmpeg) + ("ffmpeg" ,ffmpeg-3.4) ("file" ,file) ;libmagic, for the MIME plug-in ("glib" ,glib) ("gstreamer" ,gstreamer) |