Author: viric
Date: Sat Apr 23 23:04:22 2011
New Revision: 26944
URL: https://svn.nixos.org/websvn/nix/?rev=26944&sc=1
Log:
MPlayer does not depend on a *built* ffmpeg.
Modified:
nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix
Modified: nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Sat Apr 23
21:58:30 2011 (r26943)
+++ nixpkgs/trunk/pkgs/applications/video/MPlayer/default.nix Sat Apr 23
23:04:22 2011 (r26944)
@@ -80,7 +80,7 @@
'';
buildInputs =
- [ freetype zlib pkgconfig ffmpeg ]
+ [ freetype zlib pkgconfig ]
++ stdenv.lib.optional x11Support [ libX11 libXext mesa ]
++ stdenv.lib.optional alsaSupport alsaLib
++ stdenv.lib.optional xvSupport libXv
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
