forked from mirrors/nixpkgs
Use the mergeOneOption function instead of duplicated code.
svn path=/nixos/branches/fix-style/; revision=13859
This commit is contained in:
parent
639be32a8a
commit
dcc981840e
|
@ -1,8 +1,7 @@
|
||||||
{pkgs, config, ...}:
|
{pkgs, config, ...}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (builtins) head tail;
|
inherit (pkgs.lib) mkOption mergeOneOption mkIf filter optionalString any;
|
||||||
inherit (pkgs.lib) mkOption mkIf filter optionalString any;
|
|
||||||
cfg = config.services.xserver.desktopManager;
|
cfg = config.services.xserver.desktopManager;
|
||||||
|
|
||||||
needBGCond = d: ! (d ? bgSupport && d.bgSupport);
|
needBGCond = d: ! (d ? bgSupport && d.bgSupport);
|
||||||
|
@ -58,10 +57,8 @@ in
|
||||||
Default desktop manager loaded if none have been chosen.
|
Default desktop manager loaded if none have been chosen.
|
||||||
";
|
";
|
||||||
merge = name: list:
|
merge = name: list:
|
||||||
let defaultDM = head list; in
|
let defaultDM = mergeOneOption name list; in
|
||||||
if tail list != [] then
|
if any (w: w.name == defaultDM) cfg.session.list then
|
||||||
throw "Only one default desktop manager is allowed."
|
|
||||||
else if any (w: w.name == defaultDM) cfg.session.list then
|
|
||||||
defaultDM
|
defaultDM
|
||||||
else
|
else
|
||||||
throw "Default desktop manager not found.";
|
throw "Default desktop manager not found.";
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
{pkgs, config, ...}:
|
{pkgs, config, ...}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (builtins) head tail;
|
inherit (pkgs.lib) mkOption mergeOneOption optionals filter concatMap concatMapStrings;
|
||||||
inherit (pkgs.lib) mkOption optionals filter concatMap concatMapStrings;
|
|
||||||
cfg = config.services.xserver;
|
cfg = config.services.xserver;
|
||||||
xorg = cfg.package;
|
xorg = cfg.package;
|
||||||
|
|
||||||
|
@ -159,11 +158,7 @@ in
|
||||||
the display manager start the xserver.
|
the display manager start the xserver.
|
||||||
";
|
";
|
||||||
|
|
||||||
merge = name: list:
|
merge = mergeOneOption;
|
||||||
if tail list != [] then
|
|
||||||
throw "only one display manager is allowed."
|
|
||||||
else
|
|
||||||
head list;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,8 +1,7 @@
|
||||||
{pkgs, config, ...}:
|
{pkgs, config, ...}:
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (builtins) head tail;
|
inherit (pkgs.lib) mkOption mergeOneOption any;
|
||||||
inherit (pkgs.lib) mkOption any;
|
|
||||||
cfg = config.services.xserver.windowManager;
|
cfg = config.services.xserver.windowManager;
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -47,10 +46,8 @@ in
|
||||||
Default window manager loaded if none have been chosen.
|
Default window manager loaded if none have been chosen.
|
||||||
";
|
";
|
||||||
merge = name: list:
|
merge = name: list:
|
||||||
let defaultWM = head list; in
|
let defaultWM = mergeOneOption name list; in
|
||||||
if tail list != [] then
|
if any (w: w.name == defaultWM) cfg.session then
|
||||||
throw "Only one default window manager is allowed."
|
|
||||||
else if any (w: w.name == defaultWM) cfg.session then
|
|
||||||
defaultWM
|
defaultWM
|
||||||
else
|
else
|
||||||
throw "Default window manager not found.";
|
throw "Default window manager not found.";
|
||||||
|
|
Loading…
Reference in a new issue