public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mplayer: Disable use of unfree binary codecs by default

Browse Source
This commit is contained in:
Eelco Dolstra 2013-01-14 23:08:27 +01:00
parent f286cc65b1
commit bb6db816fe
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/applications/video/mplayer/default.nix
View File

@ -18,6 +18,7 @@
, pulseSupport ? false, pulseaudio ? null , pulseSupport ? false, pulseaudio ? null
# For screenshots # For screenshots
, libpngSupport ? true, libpng ? null , libpngSupport ? true, libpng ? null
, useUnfreeCodecs ? false
}: }:
assert x11Support -> (libX11 != null && libXext != null && mesa != null); assert x11Support -> (libX11 != null && libXext != null && mesa != null);
@ -66,9 +67,7 @@ let
cp -prv * $out cp -prv * $out
''; '';
meta = { meta.license = "unfree";
license = "unfree";
};
} else null; } else null;
in in
@ -140,8 +139,7 @@ stdenv.mkDerivation rec {
${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"} ${if x264Support then "--enable-x264 --disable-x264-lavc" else "--disable-x264 --enable-x264-lavc"}
${if jackaudioSupport then "--enable-jack" else "--disable-jack"} ${if jackaudioSupport then "--enable-jack" else "--disable-jack"}
${if pulseSupport then "--enable-pulse" else "--disable-pulse"} ${if pulseSupport then "--enable-pulse" else "--disable-pulse"}
${optionalString (useUnfreeCodecs && codecs != null) "--codecsdir=${codecs}"}
${optionalString (codecs != null) "--codecsdir=${codecs}"}
${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"} ${optionalString (stdenv.isi686 || stdenv.isx86_64) "--enable-runtime-cpudetection"}
--enable-freetype --enable-freetype
--disable-xanim --disable-xanim
@ -154,6 +152,8 @@ stdenv.mkDerivation rec {
NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext"; NIX_LDFLAGS = stdenv.lib.optionalString x11Support "-lX11 -lXext";
enableParallelBuilding = true;
# Provide a reasonable standard font. Maybe we should symlink here. # Provide a reasonable standard font. Maybe we should symlink here.
postInstall = postInstall =
'' ''