diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2018-12-03 08:52:17 +0100 |
| commit | 194451347dc60092132d06b84a83c5205d79299a (patch) | |
| tree | 828475b685c349cdd7b74c09beb7336d38bdf6f0 /gnu/packages/graphics.scm | |
| parent | 37c6f11f8dfa1880db86a3510c9e50990304d76c (diff) | |
| parent | 8cddb0d6363d13f74de5409ef29b7913228f49b9 (diff) | |
| download | guix-194451347dc60092132d06b84a83c5205d79299a.tar.gz | |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/graphics.scm')
| -rw-r--r-- | gnu/packages/graphics.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index c3c1a4a580..6e184d3334 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -85,7 +85,8 @@ "blender-" version ".tar.gz")) (sha256 (base32 - "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")))) + "1g4kcdqmf67srzhi3hkdnr4z1ph4h9sza1pahz38mrj998q4r52c")) + (patches (search-patches "blender-newer-ffmpeg.patch")))) (build-system cmake-build-system) (arguments (let ((python-version (version-major+minor (package-version python)))) @@ -141,7 +142,7 @@ ("libjpeg" ,libjpeg) ("libpng" ,libpng) ("libtiff" ,libtiff) - ("ffmpeg-2.8" ,ffmpeg-2.8) ;<https://lists.gnu.org/archive/html/guix-devel/2016-04/msg01019.html> + ("ffmpeg" ,ffmpeg) ("fftw" ,fftw) ("jack" ,jack-1) ("libsndfile" ,libsndfile) |