From f0cdea2e9983679a0a6c7d650ec459ce11deef9b Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 19 Jun 2012 18:05:38 +0200 Subject: [PATCH] chromium: Use patches from system OpenSSL. This is mainly because of the patch to use OPENSSL_X509_CERT_FILE as a way to specify the CA bundle. A browser which isn't able to verify SSL certificates might be somewhat useless. --- pkgs/applications/networking/browsers/chromium/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index fe7f62d157ba..7b71df6f715f 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -85,10 +85,16 @@ in stdenv.mkDerivation rec { libXScrnSaver libXcursor ] ++ stdenv.lib.optional gnomeKeyringSupport libgnome_keyring; + opensslPatches = openssl.patches; + prePatch = "patchShebangs ."; patches = stdenv.lib.optional (!useSELinux) ./enable_seccomp.patch; + postPatch = stdenv.lib.optionalString useOpenSSL '' + cat $opensslPatches | patch -p1 -d third_party/openssl/openssl + ''; + gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { linux_use_gold_binary = false; linux_use_gold_flags = false;