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

chromium: Allow to switch off openssl support.

Browse Source 
Currently building fails with NSS, so we're using OpenSSL by default. And that's
why we want to make this configurable so if we manage to fix that build failure,
we could switch to using NSS by default.
This commit is contained in:
aszlig 2012-06-19 18:11:59 +02:00 committed by Eelco Dolstra
parent f0cdea2e99
commit c2b145c32f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@
, v8, xdg_utils, yasm, zlib , v8, xdg_utils, yasm, zlib
, python, perl, pkgconfig , python, perl, pkgconfig
, nspr, udev , nspr, nss, udev
, utillinux, alsaLib , utillinux, alsaLib
, gcc, bison, gperf , gcc, bison, gperf
, krb5 , krb5
@ -17,6 +17,7 @@
, useSELinux ? false , useSELinux ? false
, naclSupport ? false , naclSupport ? false
, useOpenSSL ? true
, gnomeKeyringSupport ? false , gnomeKeyringSupport ? false
, useProprietaryCodecs ? false , useProprietaryCodecs ? false
}: }:
@ -59,7 +60,7 @@ let
bzip2 ffmpeg flac # harfbuzz bzip2 ffmpeg flac # harfbuzz
icu libevent expat libjpeg icu libevent expat libjpeg
libpng libwebp libxml2 libxslt # skia libpng libwebp libxml2 libxslt # skia
speex sqlite openssl # stlport speex sqlite # stlport
v8 xdg_utils yasm zlib v8 xdg_utils yasm zlib
]; ];
@ -78,6 +79,7 @@ in stdenv.mkDerivation rec {
which makeWrapper which makeWrapper
python perl pkgconfig python perl pkgconfig
nspr udev nspr udev
(if useOpenSSL then openssl else nss)
utillinux alsaLib utillinux alsaLib
gcc bison gperf gcc bison gperf
krb5 krb5
@ -85,7 +87,7 @@ in stdenv.mkDerivation rec {
libXScrnSaver libXcursor libXScrnSaver libXcursor
] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring; ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring;
opensslPatches = openssl.patches; opensslPatches = stdenv.lib.optional useOpenSSL openssl.patches;
prePatch = "patchShebangs ."; prePatch = "patchShebangs .";
@ -101,7 +103,7 @@ in stdenv.mkDerivation rec {
proprietary_codecs = false; proprietary_codecs = false;
use_gnome_keyring = gnomeKeyringSupport; use_gnome_keyring = gnomeKeyringSupport;
disable_nacl = !naclSupport; disable_nacl = !naclSupport;
use_openssl = true; use_openssl = useOpenSSL;
selinux = useSELinux; selinux = useSELinux;
use_cups = false; use_cups = false;
} // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") { } // stdenv.lib.optionalAttrs (stdenv.system == "x86_64-linux") {