Rename option: services.xserver.packageFun -> .package
svn path=/nixos/trunk/; revision=12553
This commit is contained in:
parent
3fd58f8a03
commit
2e9dc1ea47
@ -1417,7 +1417,12 @@ in
|
|||||||
|
|
||||||
packageFun = mkOption {
|
packageFun = mkOption {
|
||||||
default = pkgs.xorg;
|
default = pkgs.xorg;
|
||||||
merge = backwardPkgsFunMerge;
|
merge = obsolete "option" backwardPkgsFunMerge;
|
||||||
|
description = "Obsolete: use 'package' instead.";
|
||||||
|
};
|
||||||
|
|
||||||
|
package = mkOption {
|
||||||
|
default = config.services.xserver.packageFun; # pkgs.xorg;
|
||||||
description = "
|
description = "
|
||||||
Alternative X.org package to use. For
|
Alternative X.org package to use. For
|
||||||
example, you can replace individual drivers.
|
example, you can replace individual drivers.
|
||||||
|
@ -10,7 +10,7 @@ let
|
|||||||
|
|
||||||
# Abbreviations.
|
# Abbreviations.
|
||||||
cfg = config.services.xserver;
|
cfg = config.services.xserver;
|
||||||
xorg = cfg.packageFun;
|
xorg = cfg.package;
|
||||||
gnome = pkgs.gnome;
|
gnome = pkgs.gnome;
|
||||||
stdenv = pkgs.stdenv;
|
stdenv = pkgs.stdenv;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user