Author: sandervanderburg
Date: Wed Jun 29 19:22:02 2011
New Revision: 27559
URL: https://svn.nixos.org/websvn/nix/?rev=27559&sc=1
Log:
Ensure that the shared ffmpeg is used, instead of the one included in the kino
source tarball
Modified:
nixpkgs/trunk/pkgs/applications/video/kino/default.nix
Modified: nixpkgs/trunk/pkgs/applications/video/kino/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/kino/default.nix Wed Jun 29
16:21:02 2011 (r27558)
+++ nixpkgs/trunk/pkgs/applications/video/kino/default.nix Wed Jun 29
19:22:02 2011 (r27559)
@@ -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 @@
};
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
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
