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

chromium+chrome: Don't import update.nix directly

Browse Source 
Regression introduced by f28b71023c.

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>
This commit is contained in:
aszlig 2016-05-04 23:12:33 +02:00
parent f28b71023c
commit 3f7735fe65
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,6 +84,7 @@ in stdenv.mkDerivation {
inherit (chromium.browser) meta packageName; inherit (chromium.browser) meta packageName;
passthru = { passthru = {
inherit (chromium) upstream-info;
mkDerivation = chromium.mkChromiumDerivation; mkDerivation = chromium.mkChromiumDerivation;
}; };
} }

6
pkgs/applications/networking/browsers/google-chrome/default.nix
View File

@ -26,13 +26,13 @@
# Necessary for USB audio devices. # Necessary for USB audio devices.
, pulseSupport ? true, libpulseaudio ? null , pulseSupport ? true, libpulseaudio ? null
# Only needed for getting information about upstream binaries
, chromium
}: }:
with stdenv.lib; with stdenv.lib;
with (import ../chromium/update.nix { with chromium.upstream-info;
inherit (stdenv) system;
}).getChannel channel;
let let
opusWithCustomModes = libopus.override { opusWithCustomModes = libopus.override {