diff options
author | aszlig <aszlig@redmoonstudios.org> | 2012-12-03 18:28:40 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2012-12-13 03:40:36 +0100 |
commit | 76b84f26295deb2eccc383b14c2a327548021f1c (patch) | |
tree | 54632bcb60080afc373c98fcbdf8a3ca9c1bc4c4 /nixpkgs/config.nix | |
parent | df47516b5ff19b3aa616bc4e125a407c3fbcc210 (diff) |
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>
Diffstat (limited to 'nixpkgs/config.nix')
-rw-r--r-- | nixpkgs/config.nix | 17 |
1 files changed, 7 insertions, 10 deletions
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"; |