From 5138c46432b83852311a2def5f287927d2304d99 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Dec 2012 18:00:39 +0100 Subject: [PATCH] all-packages: Add chromiumBeta and chromiumDev. Now Hydra should pick up those versions as well, so users can easily switch between different chromium channels without the need to wait up to several hours in order to build Chromium (depending on hardware of course, nowadays it shouldn't take more than one hour, I guess). Signed-off-by: aszlig --- pkgs/top-level/all-packages.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41f10bc8101..512b3105ea7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6632,13 +6632,17 @@ let }; chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { + channel = "stable"; gconf = gnome.GConf; }); - chromeWrapper = wrapFirefox - { browser = chromium; browserName = chromium.packageName; desktopName = "Chromium"; - icon = "${chromium}/share/icons/hicolor/48x48/apps/${chromium.packageName}.png"; - }; + chromiumBeta = chromium.override { channel = "beta"; }; + chromiumBetaWrapper = wrapChromium chromiumBeta; + + chromiumDev = chromium.override { channel = "dev"; }; + chromiumDevWrapper = wrapChromium chromiumDev; + + chromiumWrapper = wrapChromium chromium; cinelerra = callPackage ../applications/video/cinelerra { }; @@ -7917,6 +7921,13 @@ let wordnet = callPackage ../applications/misc/wordnet { }; + wrapChromium = browser: wrapFirefox { + inherit browser; + browserName = browser.packageName; + desktopName = "Chromium"; + icon = "${browser}/share/icons/hicolor/48x48/apps/${browser.packageName}.png"; + }; + wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" , icon ? "${browser}/lib/${browser.name}/icons/mozicon128.png" }: