gtk: make gtk.gtk2 and gtk.gtk3 not submodules

(cherry picked from commit 370a84192e)
This commit is contained in:
Robert Helgesson 2018-12-24 12:07:26 +01:00
parent 5b66b89d6e
commit be7017b9c8
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89

View file

@ -100,63 +100,51 @@ in
description = "The GTK+2/3 theme to use."; description = "The GTK+2/3 theme to use.";
}; };
gtk2 = mkOption { gtk2 = {
description = "Options specific to GTK+ 2"; extraConfig = mkOption {
default = {}; type = types.lines;
type = types.submodule { default = "";
options = { example = "gtk-can-change-accels = 1";
extraConfig = mkOption { description = ''
type = types.lines; Extra configuration lines to add verbatim to
default = ""; <filename>~/.gtkrc-2.0</filename>.
example = "gtk-can-change-accels = 1"; '';
description = ''
Extra configuration lines to add verbatim to
<filename>~/.gtkrc-2.0</filename>.
'';
};
};
}; };
}; };
gtk3 = mkOption { gtk3 = {
description = "Options specific to GTK+ 3"; extraConfig = mkOption {
default = {}; type = types.attrs;
type = types.submodule { default = {};
options = { example = { gtk-cursor-blink = false; gtk-recent-files-limit = 20; };
extraConfig = mkOption { description = ''
type = types.attrs; Extra configuration options to add to
default = {}; <filename>~/.config/gtk-3.0/settings.ini</filename>.
example = { gtk-cursor-blink = false; gtk-recent-files-limit = 20; }; '';
description = '' };
Extra configuration options to add to
<filename>~/.config/gtk-3.0/settings.ini</filename>.
'';
};
extraCss = mkOption { extraCss = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
description = '' description = ''
Extra configuration lines to add verbatim to Extra configuration lines to add verbatim to
<filename>~/.config/gtk-3.0/gtk.css</filename>. <filename>~/.config/gtk-3.0/gtk.css</filename>.
''; '';
}; };
waylandSupport = mkOption { waylandSupport = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = '' description = ''
Support GSettings provider (dconf) in addition to Support GSettings provider (dconf) in addition to
GtkSettings (INI file). This is needed for Wayland. GtkSettings (INI file). This is needed for Wayland.
</para><para> </para><para>
Note, on NixOS the following line must be in the Note, on NixOS the following line must be in the
system configuration: system configuration:
<programlisting> <programlisting>
services.dbus.packages = [ pkgs.gnome3.dconf ]; services.dbus.packages = [ pkgs.gnome3.dconf ];
</programlisting> </programlisting>
''; '';
};
};
}; };
}; };
}; };