From 44190ff1b9124735dcc4212c6ae48eb8b9bcc225 Mon Sep 17 00:00:00 2001 From: Gergely Risko Date: Wed, 2 Apr 2014 23:34:31 +0200 Subject: [PATCH] Update ffmpeg dependency in oraclejdk7 --- pkgs/development/compilers/jdk/jdk7-linux.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/jdk/jdk7-linux.nix b/pkgs/development/compilers/jdk/jdk7-linux.nix index 106b9fa02d79..2d2c07c67ff7 100644 --- a/pkgs/development/compilers/jdk/jdk7-linux.nix +++ b/pkgs/development/compilers/jdk/jdk7-linux.nix @@ -9,7 +9,7 @@ , glib , libxml2 , libav_0_8 -, ffmpeg_0_6 +, ffmpeg , libxslt , mesa_noglu , freetype @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg_0_6 libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++ + [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf] ++ (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []); passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins";