gtk: remove option gtk.gtk3.waylandSupport
(cherry picked from commit cc964b4609
)
This commit is contained in:
parent
be7017b9c8
commit
7e65605d8f
|
@ -76,6 +76,12 @@ in
|
||||||
{
|
{
|
||||||
meta.maintainers = [ maintainers.rycee ];
|
meta.maintainers = [ maintainers.rycee ];
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
(mkRemovedOptionModule ["gtk" "gtk3" "waylandSupport"] ''
|
||||||
|
This options is not longer needed and can be removed.
|
||||||
|
'')
|
||||||
|
];
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = mkEnableOption "GTK 2/3 configuration";
|
enable = mkEnableOption "GTK 2/3 configuration";
|
||||||
|
@ -131,21 +137,6 @@ in
|
||||||
<filename>~/.config/gtk-3.0/gtk.css</filename>.
|
<filename>~/.config/gtk-3.0/gtk.css</filename>.
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
waylandSupport = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = ''
|
|
||||||
Support GSettings provider (dconf) in addition to
|
|
||||||
GtkSettings (INI file). This is needed for Wayland.
|
|
||||||
</para><para>
|
|
||||||
Note, on NixOS the following line must be in the
|
|
||||||
system configuration:
|
|
||||||
<programlisting>
|
|
||||||
services.dbus.packages = [ pkgs.gnome3.dconf ];
|
|
||||||
</programlisting>
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -176,7 +167,6 @@ in
|
||||||
optional (opt != null && opt.package != null) opt.package;
|
optional (opt != null && opt.package != null) opt.package;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
||||||
home.packages =
|
home.packages =
|
||||||
optionalPackage cfg.font
|
optionalPackage cfg.font
|
||||||
++ optionalPackage cfg.theme
|
++ optionalPackage cfg.theme
|
||||||
|
@ -192,9 +182,7 @@ in
|
||||||
|
|
||||||
xdg.configFile."gtk-3.0/gtk.css".text = cfg3.extraCss;
|
xdg.configFile."gtk-3.0/gtk.css".text = cfg3.extraCss;
|
||||||
|
|
||||||
dconf.settings = mkIf cfg3.waylandSupport {
|
dconf.settings."org/gnome/desktop/interface" = dconfIni;
|
||||||
"org/gnome/desktop/interface" = dconfIni;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue