diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2018-07-10 00:34:32 +0200 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-07-10 12:14:40 +0200 |
commit | 28b6f74c3f4402156c6f3730d2ddad8cffcc3445 (patch) | |
tree | bebb0cc46e3b26e79eb21e6f8f7ad8fcaba57a42 /pkgs/top-level/all-packages.nix | |
parent | 373bdced7fa570d83695b83a5db939a180d290b9 (diff) | |
download | nixlib-28b6f74c3f4402156c6f3730d2ddad8cffcc3445.tar nixlib-28b6f74c3f4402156c6f3730d2ddad8cffcc3445.tar.gz nixlib-28b6f74c3f4402156c6f3730d2ddad8cffcc3445.tar.bz2 nixlib-28b6f74c3f4402156c6f3730d2ddad8cffcc3445.tar.lz nixlib-28b6f74c3f4402156c6f3730d2ddad8cffcc3445.tar.xz nixlib-28b6f74c3f4402156c6f3730d2ddad8cffcc3445.tar.zst nixlib-28b6f74c3f4402156c6f3730d2ddad8cffcc3445.zip |
gnome3.gconf: remove
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bee738475257..0a8475e9b2d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1767,7 +1767,8 @@ with pkgs; }; ibus = callPackage ../tools/inputmethods/ibus { - inherit (gnome3) dconf gconf glib; + gconf = gnome2.GConf; + inherit (gnome3) dconf glib; }; ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { }; @@ -12888,7 +12889,7 @@ with pkgs; }; pulseaudioFull = pulseaudio.override { - gconf = gnome3.gconf; + gconf = gnome2.GConf; x11Support = true; jackaudioSupport = true; airtunesSupport = true; @@ -15290,7 +15291,7 @@ with pkgs; bonzomatic = callPackage ../applications/editors/bonzomatic { }; - brackets = callPackage ../applications/editors/brackets { gconf = gnome3.gconf; }; + brackets = callPackage ../applications/editors/brackets { gconf = gnome2.GConf; }; notmuch-bower = callPackage ../applications/networking/mailreaders/notmuch-bower { }; @@ -20142,7 +20143,8 @@ with pkgs; mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gconf gsettings-desktop-schemas; + inherit (gnome3) gsettings-desktop-schemas; + gconf = gnome2.GConf; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs); @@ -20947,7 +20949,7 @@ with pkgs; cups-zj-58 = callPackage ../misc/cups/drivers/zj-58 { }; crashplan = callPackage ../applications/backup/crashplan { }; - crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { inherit (gnome3) gconf; }; + crashplansb = callPackage ../applications/backup/crashplan/crashplan-small-business.nix { gconf = gnome2.GConf; }; colort = callPackage ../applications/misc/colort { }; |