diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95c268d1c3d..43e1197f257 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -456,7 +456,7 @@ in findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; wrapGAppsHook = makeSetupHook { - deps = lib.optional (!stdenv.isDarwin) gnome3.dconf.lib ++ [ gtk3 librsvg makeWrapper ]; + deps = lib.optional (!stdenv.isDarwin) dconf.lib ++ [ gtk3 librsvg makeWrapper ]; } ../build-support/setup-hooks/wrap-gapps-hook.sh; separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh; @@ -1512,6 +1512,8 @@ in datovka = libsForQt5.callPackage ../applications/networking/datovka { }; + dconf = callPackage ../development/libraries/dconf { }; + ddar = callPackage ../tools/backup/ddar { }; ddate = callPackage ../tools/misc/ddate { }; @@ -2438,9 +2440,7 @@ in libkkc = callPackage ../tools/inputmethods/libkkc { }; - ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf; - }; + ibus = callPackage ../tools/inputmethods/ibus { }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -2461,9 +2461,7 @@ in protobuf = pkgs.protobuf.overrideDerivation (oldAttrs: { stdenv = clangStdenv; }); }; - table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { - inherit (gnome3) dconf; - }; + table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { }; table-chinese = callPackage ../tools/inputmethods/ibus-engines/ibus-table-chinese { ibus-table = ibus-engines.table; @@ -2482,9 +2480,7 @@ in }; }; - ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { - inherit (gnome3) dconf; - }; + ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { }; interception-tools = callPackage ../tools/inputmethods/interception-tools { }; interception-tools-plugins = { @@ -13586,11 +13582,11 @@ in inherit stdenv fetchurl fetchpatch fetchFromGitHub makeSetupHook makeWrapper; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; + inherit dconf; inherit harfbuzz; inherit libGL; inherit perl; inherit gtk3; - inherit (gnome3) dconf; inherit (gst_all_1) gstreamer gst-plugins-base; inherit llvmPackages_5; }); @@ -19025,9 +19021,7 @@ in gmrun = callPackage ../applications/misc/gmrun {}; - gnucash = callPackage ../applications/office/gnucash { - inherit (gnome3) dconf; - }; + gnucash = callPackage ../applications/office/gnucash { }; goffice = callPackage ../development/libraries/goffice { }; @@ -19748,9 +19742,7 @@ in lifelines = callPackage ../applications/misc/lifelines { }; - liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) dconf; - }; + liferea = callPackage ../applications/networking/newsreaders/liferea { }; lightworks = callPackage ../applications/video/lightworks { portaudio = portaudio2014; @@ -19888,7 +19880,7 @@ in }; matchbox = callPackage ../applications/window-managers/matchbox { }; - + matrixcli = callPackage ../applications/networking/instant-messengers/matrixcli { inherit (python3Packages) buildPythonApplication buildPythonPackage pygobject3 pytestrunner requests responses pytest python-olm @@ -20786,9 +20778,7 @@ in quantomatic = callPackage ../applications/science/physics/quantomatic { }; - quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { - inherit (gnome3) dconf; - }; + quassel = libsForQt5.callPackage ../applications/networking/irc/quassel { }; quasselClient = quassel.override { monolithic = false; @@ -21660,7 +21650,6 @@ in virt-what = callPackage ../applications/virtualization/virt-what { }; virt-manager = callPackage ../applications/virtualization/virt-manager { - dconf = gnome3.dconf; system-libvirt = libvirt; }; |