From caabb8ee47d9aa858b63b5a0246a4b5b4016f9ad Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 3 Dec 2012 17:55:09 +0100 Subject: [PATCH] chromium: Allow package override on channels. This allows for more flexible overrides instead of just passing a custom configuration attrset like: chromium.override { config.chromium.channel = "beta"; } So you can now simply do: chromium.override { channel = "beta"; } Signed-off-by: aszlig --- pkgs/applications/networking/browsers/chromium/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 7d41f72df207..0415ae85ac0b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -21,6 +21,8 @@ , nss, openssl # config.openssl , pulseaudio # config.pulseaudio , libselinux # config.selinux + +, channel ? "stable" }: with stdenv.lib; @@ -29,7 +31,6 @@ let mkConfigurable = mapAttrs (flag: default: attrByPath ["chromium" flag] default config); cfg = mkConfigurable { - channel = "stable"; selinux = false; nacl = false; openssl = false; @@ -40,7 +41,7 @@ let pulseaudio = config.pulseaudio or true; }; - sourceInfo = builtins.getAttr cfg.channel (import ./sources.nix); + sourceInfo = builtins.getAttr channel (import ./sources.nix); mkGypFlags = let