swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 21:09:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that the shared ffmpeg is used, instead of the one included in the kino source tarball

Browse source 
svn path=/nixpkgs/trunk/; revision=27559
This commit is contained in:
Sander van der Burg 2011-06-29 19:22:02 +00:00
parent 11210cf06f
commit 703f1b23fb
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/applications/video/kino/default.nix
View file

@ -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