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

chromium: Prepare for building the -lite package.

Browse Source 
We currently can't build the -lite package because beta and dev versions
aren't yet compatible with ICU version 52. But apart from that blocker,
this should get us ready for the switch.

Also, we're now correctly unbundling all dependencies which are used
from <nixpkgs>.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2014-03-17 21:53:29 +01:00
parent e2dba7c6cf
commit 9f45c2cbba
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ stdenv, fetchurl, makeWrapper, ninja, which { stdenv, fetchurl, makeWrapper, ninja, which
# default dependencies # default dependencies
, bzip2, flac, speex , bzip2, flac, speex, icu, libopus
, libevent, expat, libjpeg , libevent, expat, libjpeg, snappy
, libpng, libxml2, libxslt , libpng, libxml2, libxslt
, xdg_utils, yasm, zlib , xdg_utils, yasm, zlib
, libusb1, libexif, pciutils , libusb1, libexif, pciutils
@ -117,8 +117,9 @@ let
use_system_libexif = true; use_system_libexif = true;
use_system_libjpeg = true; use_system_libjpeg = true;
use_system_libpng = false; # PNG dlopen() version conflict use_system_libpng = false; # PNG dlopen() version conflict
use_system_libusb = true;
use_system_libxml = true; use_system_libxml = true;
use_system_opus = true;
use_system_snappy = true;
use_system_speex = true; use_system_speex = true;
use_system_ssl = useOpenSSL; use_system_ssl = useOpenSSL;
use_system_stlport = true; use_system_stlport = true;
@ -128,7 +129,8 @@ let
use_system_protobuf = true; use_system_protobuf = true;
use_system_harfbuzz = false; use_system_harfbuzz = false;
use_system_icu = false; use_system_icu = false; # Doesn't support ICU 52 yet.
use_system_libusb = false; # http://crbug.com/266149
use_system_libwebp = false; # http://crbug.com/133161 use_system_libwebp = false; # http://crbug.com/133161
use_system_skia = false; use_system_skia = false;
use_system_sqlite = false; # http://crbug.com/22208 use_system_sqlite = false; # http://crbug.com/22208
@ -136,8 +138,8 @@ let
}; };
defaultDependencies = [ defaultDependencies = [
bzip2 flac speex bzip2 flac speex icu libopus
libevent expat libjpeg libevent expat libjpeg snappy
libpng libxml2 libxslt libpng libxml2 libxslt
xdg_utils yasm zlib xdg_utils yasm zlib
libusb1 libexif libusb1 libexif
@ -230,6 +232,7 @@ in stdenv.mkDerivation rec {
}); });
configurePhase = '' configurePhase = ''
python build/linux/unbundle/replace_gyp_files.py ${gypFlags}
python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags}
''; '';