From 76b84f26295deb2eccc383b14c2a327548021f1c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 3 Dec 2012 18:28:40 +0100
Subject: nixpkgs: Directly override chromium package.

The chromium package in upstream nixpkgs no longer uses the config attribute set
in order to determine package build options, so we don't need to pass around
fake config attributes anymore.

In addition we now have a convenient chromiemBetaWrapper attribute which allows
us to directly specify a specific channel, which is possibly already built by
Hydra.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixpkgs/config.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'nixpkgs')

diff --git a/nixpkgs/config.nix b/nixpkgs/config.nix
index 751b4770..7980cfa0 100644
--- a/nixpkgs/config.nix
+++ b/nixpkgs/config.nix
@@ -72,7 +72,7 @@ let
 
     misc = with pkgs; [
       lastwatch
-      chromeWrapper
+      chromiumBetaWrapper
       glxinfo
       imagemagick
       graphviz
@@ -85,7 +85,6 @@ let
   tkabberRev = 2009;
 in {
   pulseaudio = true;
-  chromium.channel = "beta";
   chromium.enableGoogleTalkPlugin = true;
   chromium.jre = true;
 
@@ -216,14 +215,12 @@ in {
     testChromiumBuild = let
       buildChannels = [ "stable" "beta" "dev" ];
       buildChromium = chan: chromium.override {
-        config.chromium = {
-          channel = chan;
-          gnome = true;
-          gnomeKeyring = true;
-          proprietaryCodecs = true;
-          cups = true;
-          pulseaudio = true;
-        };
+        channel = chan;
+        gnomeSupport = true;
+        gnomeKeyringSupport = true;
+        proprietaryCodecs = true;
+        cupsSupport = true;
+        pulseSupport = true;
       };
     in stdenv.mkDerivation {
       name = "test-chromium-build";
-- 
cgit 1.4.1