@@ -456,7 +456,7 @@ in
456456 findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh;
457457
458458 wrapGAppsHook = makeSetupHook {
459− deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ];
459+ deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ];
460460 } ../build-support/setup-hooks/wrap-gapps-hook.sh;
461461
462462 separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
@@ -1512,6 +1512,8 @@ in
15121512
15131513 datovka = libsForQt5.callPackage ../applications/networking/datovka { };
15141514
1515+ dconf = callPackage ../development/libraries/dconf { };
1516+
15151517 ddar = callPackage ../tools/backup/ddar { };
15161518
15171519 ddate = callPackage ../tools/misc/ddate { };
@@ -2438,9 +2440,7 @@ in
24382440
24392441 libkkc = callPackage ../tools/inputmethods/libkkc { };
24402442
2441− ibus = callPackage ../tools/inputmethods/ibus {
2442− inherit (gnome3) dconf;
2443− };
2443+ ibus = callPackage ../tools/inputmethods/ibus { };
24442444
24452445 ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
24462446
@@ -2461,9 +2461,7 @@ in
24612461 protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; });
24622462 };
24632463
2464− table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
2465− inherit (gnome3) dconf;
2466− };
2464+ table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
24672465
24682466 table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese {
24692467 ibus-table = ibus-engines.table;
@@ -2482,9 +2480,7 @@ in
24822480 };
24832481 };
24842482
2485− ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
2486− inherit (gnome3) dconf;
2487− };
2483+ ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { };
24882484
24892485 interception-tools = callPackage ../tools/inputmethods/interception-tools { };
24902486 interception-tools-plugins = {
@@ -13586,11 +13582,11 @@ in
1358613582 inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper;
1358713583 bison = bison2; # error: too few arguments to function 'int yylex(...
1358813584 inherit cups;
13585+ inherit dconf;
1358913586 inherit harfbuzz;
1359013587 inherit libGL;
1359113588 inherit perl;
1359213589 inherit gtk3;
13593− inherit (gnome3) dconf;
1359413590 inherit (gst_all_1) gstreamer gst-plugins-base;
1359513591 inherit llvmPackages_5;
1359613592 });
@@ -19025,9 +19021,7 @@ in
1902519021
1902619022 gmrun = callPackage ../applications/misc/gmrun {};
1902719023
19028− gnucash = callPackage ../applications/office/gnucash {
19029− inherit (gnome3) dconf;
19030− };
19024+ gnucash = callPackage ../applications/office/gnucash { };
1903119025
1903219026 goffice = callPackage ../development/libraries/goffice { };
1903319027
@@ -19748,9 +19742,7 @@ in
1974819742
1974919743 lifelines = callPackage ../applications/misc/lifelines { };
1975019744
19751− liferea = callPackage ../applications/networking/newsreaders/liferea {
19752− inherit (gnome3) dconf;
19753− };
19745+ liferea = callPackage ../applications/networking/newsreaders/liferea { };
1975419746
1975519747 lightworks = callPackage ../applications/video/lightworks {
1975619748 portaudio = portaudio2014;
@@ -19888,7 +19880,7 @@ in
1988819880 };
1988919881
1989019882 matchbox = callPackage ../applications/window-managers/matchbox { };
19891−
19883+
1989219884 matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli {
1989319885 inherit (python3Packages) buildPythonApplication buildPythonPackage
1989419886 pygobject3 pytestrunner requests responses pytest python-olm
@@ -20786,9 +20778,7 @@ in
2078620778
2078720779 quantomatic = callPackage ../applications/science/physics/quantomatic { };
2078820780
20789− quassel = libsForQt5.callPackage ../applications/networking/irc/quassel {
20790− inherit (gnome3) dconf;
20791− };
20781+ quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { };
2079220782
2079320783 quasselClient = quassel.override {
2079420784 monolithic = false;
@@ -21063,7 +21053,7 @@ in
2106321053 split2flac = callPackage ../applications/audio/split2flac { };
2106421054
2106521055 spotify-tui = callPackage ../applications/audio/spotify-tui {
21066− inherit (darwin.apple_sdk.frameworks) Security;
21056+ inherit (darwin.apple_sdk.frameworks) AppKit Security;
2106721057 };
2106821058
2106921059 squishyball = callPackage ../applications/audio/squishyball {
@@ -21660,7 +21650,6 @@ in
2166021650 virt-what = callPackage ../applications/virtualization/virt-what { };
2166121651
2166221652 virt-manager = callPackage ../applications/virtualization/virt-manager {
21663− dconf = gnome3.dconf;
2166421653 system-libvirt = libvirt;
2166521654 };
2166621655