From 5813e99fb35f2d84da06fa6b27082f74b4144d89 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Sep 2011 09:46:14 +0000 Subject: [PATCH] * Fix description. svn path=/nixos/trunk/; revision=29022 --- modules/misc/nixpkgs.nix | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix index 88f5de1be5c6..a3ceba9e7273 100644 --- a/modules/misc/nixpkgs.nix +++ b/modules/misc/nixpkgs.nix @@ -32,20 +32,25 @@ in nixpkgs.config = pkgs.lib.mkOption { default = {}; - example = { - firefox.enableGeckoMediaPlayer = true; - }; + example = + '' + { firefox.enableGeckoMediaPlayer = true; + packageOverrides = pkgs: { + firefox60Pkgs = pkgs.firefox60Pkgs.override { + enableOfficialBranding = true; + }; + }; + } + ''; type = configType; description = '' - The configuration of the Nix Packages collection. This expression - defines default value of attributes and allow packages to be - overriden globally via the `packageOverrides'. - - the `packageOverrides' configuration option must be a set of new or - overriden packages. Any occurence of `pkgs' inside this attribute - set refers to the *original* (un-overriden) set of packages, - allowing packageOverrides attributes to refer to the original - attributes (e.g. "packageOverrides.foo = ... pkgs.foo ..."). + The configuration of the Nix Packages collection. (For + details, see the Nixpkgs documentation.) It allows you to set + package configuration options, and to override packages + globally through the packageOverrides + option. The latter is a function that takes as an argument + the original Nixpkgs, and must evaluate + to a set of new or overriden packages. ''; };