From 857135c59a6101d317227d2112c346b208dc7bba Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 21 Feb 2013 13:57:13 +0100 Subject: [PATCH] chromium: Use system protobuf for versien 25. This should at least mitigate our build error to only occur in v8 anymore. Unfortunately we can't use v8 from nixpkgs right now, so we're going to put out our sledgehammer in the next commit. Meanwhile, it doesn't hurt to get rid of the bundled protobuf library, so let's do it. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f6832b2fd3b..c7414eec671 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -17,8 +17,11 @@ # dependencies for v25 , libvpx +# dependencies for >= v25 +, protobuf + # dependencies for >= v26 -, protobuf, speechd, libXdamage +, speechd, libXdamage # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -75,6 +78,7 @@ let use_system_v8 = false; } // optionalAttrs (post24 && !post25) { use_system_libvpx = true; + use_system_protobuf = true; }; defaultDependencies = [ @@ -89,6 +93,7 @@ let post24 = !versionOlder sourceInfo.version "25.0.0.0"; post25 = !versionOlder sourceInfo.version "26.0.0.0"; only24 = post23 && !post24; + only25 = post24 && !post25; maybeFixPulseAudioBuild = optional (only24 && pulseSupport) ./pulse_audio_fix.patch; @@ -119,9 +124,9 @@ in stdenv.mkDerivation rec { ++ optional enableSELinux libselinux ++ optional cupsSupport libgcrypt ++ optional pulseSupport pulseaudio - ++ optional post24 pciutils - ++ optional (post24 && !post25) libvpx - ++ optionals post25 [ protobuf speechd libXdamage ]; + ++ optionals post24 [ pciutils protobuf ] + ++ optional only25 libvpx + ++ optionals post25 [ speechd libXdamage ]; opensslPatches = optional useOpenSSL openssl.patches;