diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:30:19 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-05 08:30:19 +0200 |
| commit | 1dc36904d8cefa8188c785efd03274637c838e31 (patch) | |
| tree | 0cf37f0803f1e9c6985d09f2870e5ec61229d2ca /pkgs/applications/networking/browsers/chromium/default.nix | |
| parent | 75f1cc61b86b002f551529f1cafa30b4f4010bd9 (diff) | |
| parent | 7a005601d48f760864258e369364b3b847d4e9fd (diff) | |
| download | nixpkgs-1dc36904d8cefa8188c785efd03274637c838e31.tar nixpkgs-1dc36904d8cefa8188c785efd03274637c838e31.tar.gz nixpkgs-1dc36904d8cefa8188c785efd03274637c838e31.tar.bz2 nixpkgs-1dc36904d8cefa8188c785efd03274637c838e31.tar.lz nixpkgs-1dc36904d8cefa8188c785efd03274637c838e31.tar.xz nixpkgs-1dc36904d8cefa8188c785efd03274637c838e31.tar.zst nixpkgs-1dc36904d8cefa8188c785efd03274637c838e31.zip | |
Merge #14920: windows improvements, mainly mingw
Diffstat (limited to 'pkgs/applications/networking/browsers/chromium/default.nix')
| -rw-r--r-- | pkgs/applications/networking/browsers/chromium/default.nix | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 79e5e2dfec3..51493fb4655 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -19,9 +19,7 @@ let callPackage = newScope chromium; chromium = { - upstream-info = (import ./update.nix { - inherit (stdenv) system; - }).getChannel channel; + upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { inherit enableSELinux enableNaCl enableHotwording gnomeSupport @@ -29,7 +27,7 @@ let hiDPISupport; }; - browser = callPackage ./browser.nix { }; + browser = callPackage ./browser.nix { inherit channel; }; plugins = callPackage ./plugins.nix { inherit enablePepperFlash enableWideVine; @@ -86,6 +84,7 @@ in stdenv.mkDerivation { inherit (chromium.browser) meta packageName; passthru = { + inherit (chromium) upstream-info; mkDerivation = chromium.mkChromiumDerivation; }; } |