From 703f1b23fb287d2bf302126d08344e342c74dac2 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Wed, 29 Jun 2011 19:22:02 +0000 Subject: [PATCH] Ensure that the shared ffmpeg is used, instead of the one included in the kino source tarball svn path=/nixpkgs/trunk/; revision=27559 --- pkgs/applications/video/kino/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index b9aab562b25..696c1e4738c 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -52,7 +52,7 @@ { stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv , pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext -, libX11, glib, cairo, intltool +, libX11, glib, cairo, intltool, ffmpeg }: stdenv.mkDerivation { @@ -64,8 +64,9 @@ stdenv.mkDerivation { }; buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ]; # TODOoptional packages + pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg ]; # TODOoptional packages + configureFlags = "--enable-local-ffmpeg=no"; #preConfigure = " # grep 11 env-vars # ex