From 3f7735fe659a83f10e6199d2e9e1eb1f609fcca0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 4 May 2016 23:12:33 +0200
Subject: [PATCH] chromium+chrome: Don't import update.nix directly

Regression introduced by f28b71023cba59ba819b0978ebffa70e3e4d1785.

Let's now expose and use the upstream-info attribute via the main
Chromium derivation, so that other packages like the google-chrome
package doesn't need to rely on internals of the Chromium
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/applications/networking/browsers/chromium/default.nix  | 1 +
 .../networking/browsers/google-chrome/default.nix           | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 5a3b289d528..51493fb4655 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -84,6 +84,7 @@ in stdenv.mkDerivation {
   inherit (chromium.browser) meta packageName;
 
   passthru = {
+    inherit (chromium) upstream-info;
     mkDerivation = chromium.mkChromiumDerivation;
   };
 }
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 77f0d1693da..37602a89cee 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -26,13 +26,13 @@
 # Necessary for USB audio devices.
 , pulseSupport ? true, libpulseaudio ? null
 
+# Only needed for getting information about upstream binaries
+, chromium
 }:
 
 with stdenv.lib;
 
-with (import ../chromium/update.nix {
-  inherit (stdenv) system;
-}).getChannel channel;
+with chromium.upstream-info;
 
 let
   opusWithCustomModes = libopus.override {