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

chromium: Use system protobuf for versien 25.

Browse Source 
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 <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2013-02-21 13:57:13 +01:00
parent 6d560fb081
commit 857135c59a
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,8 +17,11 @@
# dependencies for v25 # dependencies for v25
, libvpx , libvpx
# dependencies for >= v25
, protobuf
# dependencies for >= v26 # dependencies for >= v26
, protobuf, speechd, libXdamage , speechd, libXdamage
# optional dependencies # optional dependencies
, libgcrypt ? null # gnomeSupport || cupsSupport , libgcrypt ? null # gnomeSupport || cupsSupport
@ -75,6 +78,7 @@ let
use_system_v8 = false; use_system_v8 = false;
} // optionalAttrs (post24 && !post25) { } // optionalAttrs (post24 && !post25) {
use_system_libvpx = true; use_system_libvpx = true;
use_system_protobuf = true;
}; };
defaultDependencies = [ defaultDependencies = [
@ -89,6 +93,7 @@ let
post24 = !versionOlder sourceInfo.version "25.0.0.0"; post24 = !versionOlder sourceInfo.version "25.0.0.0";
post25 = !versionOlder sourceInfo.version "26.0.0.0"; post25 = !versionOlder sourceInfo.version "26.0.0.0";
only24 = post23 && !post24; only24 = post23 && !post24;
only25 = post24 && !post25;
maybeFixPulseAudioBuild = optional (only24 && pulseSupport) maybeFixPulseAudioBuild = optional (only24 && pulseSupport)
./pulse_audio_fix.patch; ./pulse_audio_fix.patch;
@ -119,9 +124,9 @@ in stdenv.mkDerivation rec {
++ optional enableSELinux libselinux ++ optional enableSELinux libselinux
++ optional cupsSupport libgcrypt ++ optional cupsSupport libgcrypt
++ optional pulseSupport pulseaudio ++ optional pulseSupport pulseaudio
++ optional post24 pciutils ++ optionals post24 [ pciutils protobuf ]
++ optional (post24 && !post25) libvpx ++ optional only25 libvpx
++ optionals post25 [ protobuf speechd libXdamage ]; ++ optionals post25 [ speechd libXdamage ];
opensslPatches = optional useOpenSSL openssl.patches; opensslPatches = optional useOpenSSL openssl.patches;