colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename option: services.xserver.packageFun -> .package

Browse Source 
svn path=/nixos/trunk/; revision=12553
This commit is contained in:
Nicolas Pierron 2008-08-08 18:57:11 +00:00
parent 3fd58f8a03
commit 2e9dc1ea47
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
system/options.nix
View File

@ -1417,7 +1417,12 @@ in
packageFun = mkOption {
default = pkgs.xorg;
merge = backwardPkgsFunMerge;
merge = obsolete "option" backwardPkgsFunMerge;
description = "Obsolete: use 'package' instead.";
};
package = mkOption {
default = config.services.xserver.packageFun; # pkgs.xorg;
description = "
Alternative X.org package to use. For
example, you can replace individual drivers.

2
upstart-jobs/xserver.nix
View File

@ -10,7 +10,7 @@ let
# Abbreviations.
cfg = config.services.xserver;
xorg = cfg.packageFun;
xorg = cfg.package;
gnome = pkgs.gnome;
stdenv = pkgs.stdenv;