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

chromium: Enable proprietary codecs by default.

Browse Source 
We now switch to using bundled ffmpeg, as this adds stuff such as support for
the H.264 codec.
This commit is contained in:
aszlig 2012-06-20 10:36:26 +02:00 committed by Eelco Dolstra
parent 04ae9f288d
commit a88eb35ff1
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/applications/networking/browsers/chromium/default.nix
View File

@ -25,7 +25,7 @@ let
useOpenSSL = true; useOpenSSL = true;
enableGnomeSupport = false; enableGnomeSupport = false;
gnomeKeyringSupport = false; gnomeKeyringSupport = false;
useProprietaryCodecs = false; useProprietaryCodecs = true;
enableCUPS = false; enableCUPS = false;
}; };
@ -41,7 +41,6 @@ let
gypFlagsUseSystemLibs = { gypFlagsUseSystemLibs = {
use_system_bzip2 = true; use_system_bzip2 = true;
use_system_ffmpeg = false; # FIXME: libavformat...
use_system_flac = true; use_system_flac = true;
use_system_harfbuzz = false; # TODO use_system_harfbuzz = false; # TODO
use_system_icu = false; # FIXME: wrong version! use_system_icu = false; # FIXME: wrong version!
@ -63,7 +62,7 @@ let
}; };
defaultDependencies = [ defaultDependencies = [
bzip2 ffmpeg flac # harfbuzz bzip2 flac # harfbuzz
icu libevent expat libjpeg icu libevent expat libjpeg
libpng libwebp libxml2 libxslt # skia libpng libwebp libxml2 libxslt # skia
speex sqlite # stlport speex sqlite # stlport
@ -117,6 +116,10 @@ in stdenv.mkDerivation rec {
use_openssl = config.useOpenSSL; use_openssl = config.useOpenSSL;
selinux = config.useSELinux; selinux = config.useSELinux;
use_cups = config.enableCUPS; use_cups = config.enableCUPS;
} // stdenv.lib.optionalAttrs config.useProprietaryCodecs {
# enable support for the H.264 codec
proprietary_codecs = true;
ffmpeg_branding = "Chrome";
} // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") {
target_arch = "x64"; target_arch = "x64";
} // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") { } // stdenv.lib.optionalAttrs (stdenv.system == "i686-linux") {