From be7017b9c8848ccd5e7f4dd65107c92c789a97fd Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 24 Dec 2018 12:07:26 +0100
Subject: [PATCH] gtk: make gtk.gtk2 and gtk.gtk3 not submodules

(cherry picked from commit 370a84192ef576d0c7ae3a4623ff8131a9f4482b)
---
 modules/misc/gtk.nix | 92 +++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 52 deletions(-)

diff --git a/modules/misc/gtk.nix b/modules/misc/gtk.nix
index 9f7513d1..6542091c 100644
--- a/modules/misc/gtk.nix
+++ b/modules/misc/gtk.nix
@@ -100,63 +100,51 @@ in
         description = "The GTK+2/3 theme to use.";
       };
 
-      gtk2 = mkOption {
-        description = "Options specific to GTK+ 2";
-        default = {};
-        type = types.submodule {
-          options = {
-            extraConfig = mkOption {
-              type = types.lines;
-              default = "";
-              example = "gtk-can-change-accels = 1";
-              description = ''
-                Extra configuration lines to add verbatim to
-                <filename>~/.gtkrc-2.0</filename>.
-              '';
-            };
-          };
+      gtk2 = {
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          example = "gtk-can-change-accels = 1";
+          description = ''
+            Extra configuration lines to add verbatim to
+            <filename>~/.gtkrc-2.0</filename>.
+          '';
         };
       };
 
-      gtk3 = mkOption {
-        description = "Options specific to GTK+ 3";
-        default = {};
-        type = types.submodule {
-          options = {
-            extraConfig = mkOption {
-              type = types.attrs;
-              default = {};
-              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>.
-              '';
-            };
+      gtk3 = {
+        extraConfig = mkOption {
+          type = types.attrs;
+          default = {};
+          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 {
-              type = types.lines;
-              default = "";
-              description = ''
-                Extra configuration lines to add verbatim to
-                <filename>~/.config/gtk-3.0/gtk.css</filename>.
-              '';
-            };
+        extraCss = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Extra configuration lines to add verbatim to
+            <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>
-              '';
-            };
-          };
+        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>
+          '';
         };
       };
     };