diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-09-05 10:14:42 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-09-05 10:14:42 +0000 |
| commit | 453675c5c113ac4ba91f28005b607671c0d66698 (patch) | |
| tree | f00ca431d9421a750d6d326735a76ea3089b25d7 /modules/misc/nixpkgs.nix | |
| parent | 5813e99fb35f2d84da06fa6b27082f74b4144d89 (diff) | |
| download | nixpkgs-453675c5c113ac4ba91f28005b607671c0d66698.tar nixpkgs-453675c5c113ac4ba91f28005b607671c0d66698.tar.gz nixpkgs-453675c5c113ac4ba91f28005b607671c0d66698.tar.bz2 nixpkgs-453675c5c113ac4ba91f28005b607671c0d66698.tar.lz nixpkgs-453675c5c113ac4ba91f28005b607671c0d66698.tar.xz nixpkgs-453675c5c113ac4ba91f28005b607671c0d66698.tar.zst nixpkgs-453675c5c113ac4ba91f28005b607671c0d66698.zip | |
* Allow literal examples to be included in the manual.
svn path=/nixos/trunk/; revision=29025
Diffstat (limited to 'modules/misc/nixpkgs.nix')
| -rw-r--r-- | modules/misc/nixpkgs.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix index a3ceba9e727..78c52bca201 100644 --- a/modules/misc/nixpkgs.nix +++ b/modules/misc/nixpkgs.nix @@ -30,9 +30,9 @@ in { options = { - nixpkgs.config = pkgs.lib.mkOption { + nixpkgs.config = mkOption { default = {}; - example = + example = literalExample '' { firefox.enableGeckoMediaPlayer = true; packageOverrides = pkgs: { @@ -54,7 +54,7 @@ in ''; }; - nixpkgs.system = pkgs.lib.mkOption { + nixpkgs.system = mkOption { default = ""; description = '' Specifies the Nix platform type for which NixOS should be built. |