diff options
| author | Sander van der Burg <s.vanderburg@tudelft.nl> | 2011-06-29 19:22:02 +0000 |
|---|---|---|
| committer | Sander van der Burg <s.vanderburg@tudelft.nl> | 2011-06-29 19:22:02 +0000 |
| commit | 703f1b23fb287d2bf302126d08344e342c74dac2 (patch) | |
| tree | 6404cb95227d1265f8ce4407cdd7c103b360ec97 /pkgs/applications | |
| parent | 11210cf06f1c2c688b884b642259872b172e7b0c (diff) | |
| download | nixpkgs-703f1b23fb287d2bf302126d08344e342c74dac2.tar nixpkgs-703f1b23fb287d2bf302126d08344e342c74dac2.tar.gz nixpkgs-703f1b23fb287d2bf302126d08344e342c74dac2.tar.bz2 nixpkgs-703f1b23fb287d2bf302126d08344e342c74dac2.tar.lz nixpkgs-703f1b23fb287d2bf302126d08344e342c74dac2.tar.xz nixpkgs-703f1b23fb287d2bf302126d08344e342c74dac2.tar.zst nixpkgs-703f1b23fb287d2bf302126d08344e342c74dac2.zip | |
Ensure that the shared ffmpeg is used, instead of the one included in the kino source tarball
svn path=/nixpkgs/trunk/; revision=27559
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/video/kino/default.nix | 5 |
1 files 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 |