From 7abeda982a0d4324d06a0997deb3681c91df55ff Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 16 Apr 2019 20:38:26 -0400 Subject: [PATCH] gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas gnome3.pomodoro is left out because I don't want to create a conflict. --- nixos/modules/programs/dconf.nix | 2 +- .../services/x11/desktop-managers/gnome3.nix | 2 +- pkgs/applications/audio/radiotray-ng/default.nix | 4 ++-- pkgs/applications/audio/sonata/default.nix | 4 ++-- pkgs/applications/audio/sound-juicer/default.nix | 4 ++-- pkgs/applications/graphics/glabels/default.nix | 4 ++-- pkgs/applications/graphics/shotwell/default.nix | 3 ++- .../misc/notify-osd-customizable/default.nix | 3 ++- pkgs/applications/misc/notify-osd/default.nix | 4 ++-- .../networking/syncthing-gtk/default.nix | 4 ++-- pkgs/applications/video/pitivi/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/glade/default.nix | 4 ++-- .../gnome-3/apps/gnome-documents/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- .../desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- .../desktops/gnome-3/apps/gnome-notes/default.nix | 4 ++-- .../gnome-3/apps/gnome-photos/default.nix | 4 ++-- .../gnome-3/apps/gnome-weather/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/empathy/default.nix | 4 ++-- .../gnome-3/core/gnome-bluetooth/default.nix | 4 ++-- .../gnome-3/core/gnome-calculator/default.nix | 4 ++-- .../gnome-3/core/gnome-contacts/default.nix | 4 ++-- .../gnome-3/core/gnome-desktop/default.nix | 4 ++-- .../gnome-3/core/gnome-dictionary/default.nix | 4 ++-- .../gnome-3/core/gnome-disk-utility/default.nix | 4 ++-- .../gnome-3/core/gnome-screenshot/default.nix | 4 ++-- .../gnome-3/core/gnome-system-monitor/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- pkgs/desktops/gnome-3/default.nix | 5 ++--- pkgs/desktops/gnome-3/devtools/anjuta/default.nix | 4 ++-- .../gnome-3/misc/gnome-tweaks/default.nix | 4 ++-- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 4 ++-- .../elementary-gsettings-schemas/default.nix | 6 +++--- pkgs/development/libraries/flatpak/default.nix | 4 ++-- .../gsettings-desktop-schemas/default.nix | 0 pkgs/development/libraries/gtk+/3.x.nix | 4 ++-- .../libraries/xdg-desktop-portal-gtk/default.nix | 4 ++-- pkgs/tools/audio/pasystray/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 4 ++-- pkgs/top-level/all-packages.nix | 15 +++++---------- 43 files changed, 86 insertions(+), 90 deletions(-) rename pkgs/{desktops/gnome-3/core => development/libraries}/gsettings-desktop-schemas/default.nix (100%) diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 9c9765b06b6f..b7bfb8504b6f 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -38,7 +38,7 @@ in "${pkgs.gnome3.dconf.lib}/lib/gio/modules"; # https://github.com/NixOS/nixpkgs/pull/31891 #environment.variables.XDG_DATA_DIRS = optional cfg.enable - # "$(echo ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; + # "$(echo ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas-*)"; }; } diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d748d4308b7..8f92d3d55c33 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -18,7 +18,7 @@ let nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${pkgs.gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages} diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 1838268a0ea9..91d82d686d03 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -10,7 +10,7 @@ # GUI/Desktop , dbus , glibmm -, gnome3 +, gsettings-desktop-schemas , hicolor-icon-theme , libappindicator-gtk3 , libnotify @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl boost jsoncpp libbsd pcre - glibmm hicolor-icon-theme gnome3.gsettings-desktop-schemas libappindicator-gtk3 libnotify + glibmm hicolor-icon-theme gsettings-desktop-schemas libappindicator-gtk3 libnotify libxdg_basedir lsb-release wxGTK diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 5c22e3e77510..d5985f097e9f 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook -, python3Packages, gnome3, gtk3, gobject-introspection}: +, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; @@ -20,7 +20,7 @@ in buildPythonApplication rec { buildInputs = [ intltool wrapGAppsHook gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/applications/audio/sound-juicer/default.nix b/pkgs/applications/audio/sound-juicer/default.nix index 303532aca63d..7f22a03c1bb4 100644 --- a/pkgs/applications/audio/sound-juicer/default.nix +++ b/pkgs/applications/audio/sound-juicer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes -, wrapGAppsHook }: +, gsettings-desktop-schemas, wrapGAppsHook }: let pname = "sound-juicer"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{ nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; buildInputs = [ glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes + gsettings-desktop-schemas libmusicbrainz5 libdiscid isocodes gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-libav diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix index cf4ecf15523a..dadae22bf0c3 100644 --- a/pkgs/applications/graphics/glabels/default.nix +++ b/pkgs/applications/graphics/glabels/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, barcode, gnome3, autoreconfHook -, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book +, gtk3, gtk-doc, libxml2, librsvg , libtool, libe-book, gsettings-desktop-schemas , intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; buildInputs = [ barcode gtk3 gtk-doc gnome3.yelp-tools - gnome3.gnome-common gnome3.gsettings-desktop-schemas + gnome3.gnome-common gsettings-desktop-schemas itstool libxml2 librsvg libe-book libtool hicolor-icon-theme ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index f31b6d323995..c8ada0e85fe7 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -32,6 +32,7 @@ , itstool , libgdata , libchamplain +, gsettings-desktop-schemas , python3 }: @@ -73,7 +74,7 @@ stdenv.mkDerivation rec { libgee libgudev gexiv2 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas libraw json-glib glib diff --git a/pkgs/applications/misc/notify-osd-customizable/default.nix b/pkgs/applications/misc/notify-osd-customizable/default.nix index 828c39d5ed87..d4f3db4ca6f9 100644 --- a/pkgs/applications/misc/notify-osd-customizable/default.nix +++ b/pkgs/applications/misc/notify-osd-customizable/default.nix @@ -8,6 +8,7 @@ , libwnck3 , makeWrapper , pkgconfig +, gsettings-desktop-schemas }: let baseURI = "https://launchpad.net/~leolik/+archive/leolik"; @@ -26,7 +27,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gnome3.gsettings-desktop-schemas gnome3.gnome-common + gsettings-desktop-schemas gnome3.gnome-common libtool ]; diff --git a/pkgs/applications/misc/notify-osd/default.nix b/pkgs/applications/misc/notify-osd/default.nix index f602ce9db66a..5c60c7412c4a 100644 --- a/pkgs/applications/misc/notify-osd/default.nix +++ b/pkgs/applications/misc/notify-osd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libwnck3, libnotify, dbus-glib, makeWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "notify-osd-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glib libwnck3 libnotify dbus-glib makeWrapper - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; configureFlags = [ "--libexecdir=$(out)/bin" ]; diff --git a/pkgs/applications/networking/syncthing-gtk/default.nix b/pkgs/applications/networking/syncthing-gtk/default.nix index 389d32d5a7cc..696ced2d2465 100644 --- a/pkgs/applications/networking/syncthing-gtk/default.nix +++ b/pkgs/applications/networking/syncthing-gtk/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 -, bcrypt, gobject-introspection }: +, bcrypt, gobject-introspection, gsettings-desktop-schemas }: buildPythonApplication rec { version = "0.9.4"; @@ -24,7 +24,7 @@ buildPythonApplication rec { gtk3 librsvg libappindicator-gtk3 libnotify gnome3.adwaita-icon-theme # Schemas with proxy configuration - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/pitivi/default.nix b/pkgs/applications/video/pitivi/default.nix index 6e0b7412558e..1c124df30238 100644 --- a/pkgs/applications/video/pitivi/default.nix +++ b/pkgs/applications/video/pitivi/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook , python3Packages, gst_all_1, gtk3 , gobject-introspection, librsvg, gnome3, libnotify, gsound -, meson, ninja +, meson, ninja, gsettings-desktop-schemas }: let @@ -49,7 +49,7 @@ in python3Packages.buildPythonApplication rec { buildInputs = [ gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libnotify + gsettings-desktop-schemas libnotify gst-transcoder ] ++ (with gst_all_1; [ gstreamer gst-editing-services diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 9adffc7922c2..e0078d5ae410 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, python3 , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, libxml2, docbook_xsl -, gnome3, gdk_pixbuf, libxslt }: +, gnome3, gdk_pixbuf, libxslt, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "glade-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib libxml2 python3 python3.pkgs.pygobject3 - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index a2cba36b88d9..4491d60a5ade 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -4,7 +4,7 @@ , gnome-desktop, libzapojit, libgepub , gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42 , gobject-introspection, inkscape, poppler_utils -, desktop-file-utils, wrapGAppsHook, python3 }: +, desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-documents-${version}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inkscape poppler_utils # building getting started ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas + gtk3 glib gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme evince libsoup webkitgtk gjs gobject-introspection tracker tracker-miners libgdata diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 7d9fa2d528c0..d46882deb41e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3 }: +, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-logs-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils libxml2 libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ glib gtk3 systemd gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index be5008a51fee..b3b9fb0dddd6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3 , gobject-introspection, gdk_pixbuf, librsvg, libgweather -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup +, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas , webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { gtk3 geoclue2 gjs libgee folks gfbgraph geocode-glib libchamplain libsoup gdk_pixbuf librsvg libgweather - gnome3.gsettings-desktop-schemas evolution-data-server + gsettings-desktop-schemas evolution-data-server gnome-online-accounts gnome3.adwaita-icon-theme webkitgtk ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 66680c0af58e..4e601849a35f 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -2,7 +2,7 @@ , libxml2, python3, libnotify, wrapGAppsHook, libmediaart , gobject-introspection, gnome-online-accounts, grilo, grilo-plugins , pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib -, itstool, gnome3, gst_all_1, libdazzle, libsoup }: +, itstool, gnome3, gst_all_1, libdazzle, libsoup, gsettings-desktop-schemas }: python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { gtk3 glib libmediaart gnome-online-accounts gobject-introspection gdk_pixbuf gnome3.adwaita-icon-theme python3 grilo grilo-plugins libnotify libdazzle libsoup - gnome3.gsettings-desktop-schemas tracker + gsettings-desktop-schemas tracker gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]; propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 4a3c59eb3e53..3a28b8635a11 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -2,7 +2,7 @@ , wrapGAppsHook, itstool, desktop-file-utils, python3 , glib, gtk3, evolution-data-server , libuuid, webkitgtk, zeitgeist -, gnome3, libxml2 }: +, gnome3, libxml2, gsettings-desktop-schemas }: let version = "3.32.1"; @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib gtk3 libuuid webkitgtk gnome3.tracker gnome3.gnome-online-accounts zeitgeist - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas evolution-data-server gnome3.adwaita-icon-theme ]; diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix index 99b1cd3adf94..0a33a3bff559 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix @@ -4,7 +4,7 @@ , grilo, gnome-online-accounts , desktop-file-utils, wrapGAppsHook , gnome3, gdk_pixbuf, gexiv2, geocode-glib -, dleyna-renderer, dbus, meson, ninja, python3 }: +, dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }: let pname = "gnome-photos"; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gegl babl libgdata libdazzle - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme gfbgraph grilo-plugins grilo gnome-online-accounts tracker diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index fcce09e6c4f0..6ed00cd23f17 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection -, libgweather, meson, ninja, geoclue2, gnome-desktop, python3 }: +, libgweather, meson, ninja, geoclue2, gnome-desktop, python3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-weather-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; buildInputs = [ gtk3 gjs gobject-introspection gnome-desktop - libgweather gnome3.adwaita-icon-theme geoclue2 gnome3.gsettings-desktop-schemas + libgweather gnome3.adwaita-icon-theme geoclue2 gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index d48c59b093dc..a1d841646408 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -1,7 +1,7 @@ { stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib -, gnome3, wrapGAppsHook, telepathy-logger, gspell }: +, gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }: let pname = "polari"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 glib adwaita-icon-theme gnome3.gsettings-desktop-schemas + gtk3 glib adwaita-icon-theme gsettings-desktop-schemas telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup ]; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 4b286a9a7c66..21e8019d9371 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -2,7 +2,7 @@ , pkgconfig, gtk3, glib, gobject-introspection , wrapGAppsHook, itstool, gnupg, libsoup , gnome3, gpgme, python3, openldap, gcr -, libsecret, avahi, p11-kit, openssh }: +, libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "seahorse"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ gtk3 glib gcr - gnome3.gsettings-desktop-schemas gnupg + gsettings-desktop-schemas gnupg gnome3.adwaita-icon-theme gpgme libsecret avahi libsoup p11-kit openssh openldap libpwquality diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 19f2783be3d3..5a08454cb35e 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -6,7 +6,7 @@ , telepathy-logger, libnotify, clutter, libsoup, gnutls , evolution-data-server, yelp-xsl , libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info -, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee +, wrapGAppsHook, itstool, libxml2, libxslt, icu, libgee, gsettings-desktop-schemas , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }: stdenv.mkDerivation rec { @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { gcr libsecret libpulseaudio gdk_pixbuf libnotify clutter libsoup gnutls libgee p11-kit libcanberra-gtk3 telepathy-farstream farstream - gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas librsvg # Spell-checking enchant isocodes diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index ebea09224060..817c8324c6b2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib , udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection -, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3 }: +, gtk-doc, docbook_xsl, docbook_xml_dtd_43, python3, gsettings-desktop-schemas }: let pname = "gnome-bluetooth"; @@ -22,7 +22,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ glib gtk3 udev libnotify libcanberra-gtk3 - gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; mesonFlags = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index 38613bae2e9a..5d980c3c347a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -1,6 +1,6 @@ { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 -, gnome3, mpfr, gmp, libsoup, libmpc }: +, gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-calculator-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libxml2 gtksourceview4 mpfr gmp gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas libsoup libmpc + gsettings-desktop-schemas libsoup libmpc ]; doCheck = true; diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index b287cf35194c..099bfebd9bbf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -2,7 +2,7 @@ , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib -, vala, meson, ninja, libhandy }: +, vala, meson, ninja, libhandy, gsettings-desktop-schemas }: let version = "3.32"; @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas + gtk3 glib evolution-data-server gsettings-desktop-schemas folks gnome-desktop telepathy-glib libhandy libxml2 gnome-online-accounts cheese gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 21c152670754..6f49afe82bf2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib , gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch -, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl }: +, libseccomp, bubblewrap, gobject-introspection, gtk-doc, docbook_xsl, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-desktop-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { gtk3 glib libseccomp ]; - propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; + propagatedBuildInputs = [ gsettings-desktop-schemas ]; patches = [ (substituteAll { diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index a15d2d7f6e62..613de6c3c164 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 -, gnome3, gtk3, glib }: +, gnome3, gtk3, glib, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gnome-dictionary-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gtk3 glib gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 glib gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; passthru = { updateScript = gnome3.updateScript { diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index ed3a8e2e9d5e..8e09b152e83a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify -, itstool, gnome3, libxml2 +, itstool, gnome3, libxml2, gsettings-desktop-schemas , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 udisks2 gnome3.adwaita-icon-theme - gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas + gnome3.gnome-settings-daemon gsettings-desktop-schemas ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index f5cc430472d3..1d14481e7783 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils -, gnome3 }: +, gnome3, gsettings-desktop-schemas }: let pname = "gnome-screenshot"; @@ -23,7 +23,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; buildInputs = [ gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; passthru = { diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 7a469239fc51..83159c2ad72f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -1,6 +1,6 @@ { stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 -, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: +, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }: stdenv.mkDerivation rec { name = "gnome-system-monitor-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg - gnome3.gsettings-desktop-schemas systemd + gsettings-desktop-schemas systemd ]; postPatch = '' diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 6dea270f6c0a..688e8cc93657 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -2,7 +2,7 @@ , desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf -, substituteAll, bubblewrap, gst_all_1 +, substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas }: let @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { buildInputs = [ glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base - gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas + gnome3.adwaita-icon-theme gsettings-desktop-schemas ]; propagatedBuildInputs = [ gnome-autoar ]; diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index b120b693d657..8680e3ed81da 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -84,7 +84,7 @@ lib.makeScope pkgs.newScope (self: with self; { gjs = callPackage ./core/gjs { }; glib-networking = pkgs.glib-networking.override { - inherit gsettings-desktop-schemas; + inherit (pkgs) gsettings-desktop-schemas; }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; @@ -145,8 +145,6 @@ lib.makeScope pkgs.newScope (self: with self; { grilo-plugins = callPackage ./core/grilo-plugins { }; - gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { }; - gucharmap = callPackage ./core/gucharmap { }; gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; @@ -395,6 +393,7 @@ lib.makeScope pkgs.newScope (self: with self; { libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4 easytag meld orca rhythmbox shotwell gnome-usage clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl; + inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16 defaultIconTheme = adwaita-icon-theme; gtk = gtk3; gtkmm = gtkmm3; diff --git a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix index dcf0bd439420..d1e5179063f3 100644 --- a/pkgs/desktops/gnome-3/devtools/anjuta/default.nix +++ b/pkgs/desktops/gnome-3/devtools/anjuta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, - gdl, libgda, gtksourceview, + gdl, libgda, gtksourceview, gsettings-desktop-schemas, itstool, python3, ncurses, makeWrapper }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ flex bison gtk3 libxml2 gnome3.gjs gdl libgda gtksourceview - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; preFixup = '' diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index bf0ef7d34a05..fd7f7ef609df 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -1,5 +1,5 @@ { stdenv, meson, ninja, gettext, fetchurl -, pkgconfig, gtk3, glib, libsoup +, pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas , itstool, libxml2, python3Packages , gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python ]; buildInputs = [ - gtk3 glib gnome3.gsettings-desktop-schemas + gtk3 glib gsettings-desktop-schemas gdk_pixbuf gnome3.adwaita-icon-theme libnotify gnome3.gnome-shell python3Packages.pygobject3 libsoup gnome3.gnome-settings-daemon gnome3.nautilus diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index 67f2552b4348..543453a2bd31 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk3, intltool -, gnome3, enchant, isocodes }: +, gnome3, enchant, isocodes, gsettings-desktop-schemas }: stdenv.mkDerivation rec { name = "gtkhtml-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme - gnome3.gsettings-desktop-schemas ]; + gsettings-desktop-schemas ]; propagatedBuildInputs = [ enchant isocodes ]; diff --git a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix index 466e7b6f22fb..2726ea2b9368 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, gnome3, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas +{ stdenv, runCommand, mutter, elementary-default-settings, nixos-artwork, glib, gala, epiphany, elementary-settings-daemon, gtk3, plank, gsettings-desktop-schemas , extraGSettingsOverrides ? "" , extraGSettingsOverridePackages ? [] }: @@ -9,7 +9,7 @@ let elementary-settings-daemon epiphany gala - gnome3.mutter + mutter gsettings-desktop-schemas gtk3 plank @@ -23,7 +23,7 @@ with stdenv.lib; runCommand "elementary-gsettings-desktop-schemas" {} '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas - cp -rf ${gnome3.gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas + cp -rf ${gsettings-desktop-schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") gsettingsOverridePackages} diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix index c3cac531263a..34b3d4ee99c6 100644 --- a/pkgs/development/libraries/flatpak/default.nix +++ b/pkgs/development/libraries/flatpak/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit , bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme -, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }: +, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "flatpak"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { buildInputs = [ bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp libsoup lzma ostree polkit python3 systemd xorg.libXau - gnome3.gsettings-desktop-schemas glib-networking + gsettings-desktop-schemas glib-networking ]; checkInputs = [ valgrind ]; diff --git a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix similarity index 100% rename from pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix rename to pkgs/development/libraries/gsettings-desktop-schemas/default.nix diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 27c638d8a87f..30b33c7aea97 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes , expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi -, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook +, xorg, epoxy, json-glib, libxkbcommon, gmp, gnome3, autoreconfHook, gsettings-desktop-schemas , x11Support ? stdenv.isLinux , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , xineramaSupport ? stdenv.isLinux @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxkbcommon epoxy json-glib isocodes ] ++ optional stdenv.isDarwin AppKit; propagatedBuildInputs = with xorg; with stdenv.lib; - [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas fribidi + [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gsettings-desktop-schemas fribidi libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix index 28fa6a9ebd97..780b7d630cb7 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3, gsettings-desktop-schemas }: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-gtk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; - buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ]; + buildInputs = [ glib gtk3 gsettings-desktop-schemas ]; meta = with stdenv.lib; { description = "Desktop integration portals for sandboxed apps"; diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index cb6853c9a443..c0f0aa1bf938 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook , gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio -, xlibsWrapper +, xlibsWrapper, gsettings-desktop-schemas }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gnome3.adwaita-icon-theme avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 4207bac44732..eccf463d77cd 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme , dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook -, runtimeShell }: +, runtimeShell, gsettings-desktop-schemas }: let versionSuffix = "20190205202117.6394d03e6c"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { freetype gdk_pixbuf glib - gnome3.gsettings-desktop-schemas + gsettings-desktop-schemas gtk3 libnotify nspr diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ec5911891c2..4fb9ac2cb302 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5358,9 +5358,7 @@ in remind = callPackage ../tools/misc/remind { }; - remmina = callPackage ../applications/networking/remote/remmina { - gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas; - }; + remmina = callPackage ../applications/networking/remote/remmina { }; rename = callPackage ../tools/misc/rename { }; @@ -15934,7 +15932,7 @@ in gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; - inherit (gnome3) gsettings-desktop-schemas; + gsettings-desktop-schemas = callPackage ../development/libraries/gsettings-desktop-schemas { }; go-font = callPackage ../data/fonts/go-font { }; @@ -16772,7 +16770,6 @@ in cinelerra = callPackage ../applications/video/cinelerra { }; claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { - inherit (gnome3) gsettings-desktop-schemas; inherit (xorg) libSM; }; @@ -18428,7 +18425,7 @@ in libvmi = callPackage ../development/libraries/libvmi { }; liferea = callPackage ../applications/networking/newsreaders/liferea { - inherit (gnome3) gsettings-desktop-schemas dconf; + inherit (gnome3) dconf; }; lightworks = callPackage ../applications/video/lightworks { @@ -20731,9 +20728,7 @@ in openssl = null; }; - roxterm = callPackage ../applications/misc/roxterm { - inherit (gnome3) gsettings-desktop-schemas; - }; + roxterm = callPackage ../applications/misc/roxterm { }; termonad-with-packages = callPackage ../applications/misc/termonad { inherit (haskellPackages) ghcWithPackages; @@ -21777,8 +21772,8 @@ in mkPlasma5 = import ../desktops/plasma-5; attrs = { inherit libsForQt5 lib fetchurl; - inherit (gnome3) gsettings-desktop-schemas; gconf = gnome2.GConf; + inherit gsettings-desktop-schemas; }; in recurseIntoAttrs (makeOverridable mkPlasma5 attrs);