From d8ba5b3eff0075cf971315873696ab263ad5df48 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 22 Mar 2014 18:22:46 +0100 Subject: [PATCH] chromium: Add bundled dependencies for dev/beta. Signed-off-by: aszlig --- .../networking/browsers/chromium/browser.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 558054bba412..66e2522bf135 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -121,7 +121,7 @@ in stdenv.mkDerivation rec { ensureDir third_party # ONLY the dependencies we can't use from nixpkgs! - for bundled in ${concatStringsSep " " [ + for bundled in ${concatStringsSep " " ([ # This is in preparation of splitting up the bundled sources into separate # derivations so we some day can tremendously reduce build time. "adobe" @@ -175,7 +175,12 @@ in stdenv.mkDerivation rec { "widevine" "x86inc" "yasm" - ]}; do + ] ++ optionals (!versionOlder source.version "34.0.0.0") [ + "brotli" + "libwebm" + "nss.isolate" + "polymer" + ])}; do echo -n "Linking ${source.bundled}/$bundled to third_party/..." >&2 ${lntreeSh} "${source.bundled}/$bundled" third_party/ echo " done." >&2