diff options
Diffstat (limited to 'pkgs/desktops/gnome-3')
25 files changed, 48 insertions, 96 deletions
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 9adffc7922c..e0078d5ae41 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 a2cba36b88d..4491d60a5ad 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 7d9fa2d528c..d46882deb41 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 be5008a51fe..b3b9fb0dddd 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 66680c0af58..4e601849a35 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 4a3c59eb3e5..3a28b8635a1 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 99b1cd3adf9..0a33a3bff55 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 fcce09e6c4f..6ed00cd23f1 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 d48c59b093d..a1d84164640 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 4b286a9a7c6..21e8019d937 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 19f2783be3d..5a08454cb35 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 ebea0922406..817c8324c6b 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 38613bae2e9..5d980c3c347 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 b287cf35194..099bfebd9bb 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 21c15267075..6f49afe82bf 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 a15d2d7f6e6..613de6c3c16 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 ed3a8e2e9d5..8e09b152e83 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 f5cc430472d..1d14481e778 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 7a469239fc5..83159c2ad72 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/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix deleted file mode 100644 index c1bdcd6956e..00000000000 --- a/pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection -, meson -, ninja -, python3 - # just for passthru -, gnome3 }: - -stdenv.mkDerivation rec { - name = "gsettings-desktop-schemas-${version}"; - version = "3.32.0"; - - src = fetchurl { - url = "mirror://gnome/sources/gsettings-desktop-schemas/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0d8a6479vappgplq5crdr3ah0ykqcr3fw533wkx9v1a8lnrv8n9d"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "gsettings-desktop-schemas"; }; - }; - - # meson installs the schemas to share/glib-2.0/schemas - # We add the override file there too so it will be compiled and later moved by - # glib's setup hook. - preInstall = '' - mkdir -p $out/share/glib-2.0/schemas - cat - > $out/share/glib-2.0/schemas/remove-backgrounds.gschema.override <<- EOF - [org.gnome.desktop.background] - picture-uri=''' - - [org.gnome.desktop.screensaver] - picture-uri=''' - EOF - ''; - - postPatch = '' - chmod +x build-aux/meson/post-install.py - patchShebangs build-aux/meson/post-install.py - ''; - - buildInputs = [ glib gobject-introspection ]; - - nativeBuildInputs = [ pkgconfig python3 meson ninja ]; - - meta = with stdenv.lib; { - maintainers = gnome3.maintainers; - }; -} diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 6dea270f6c0..688e8cc9365 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 b120b693d65..8680e3ed81d 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 dcf0bd43942..d1e5179063f 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 bf0ef7d34a0..fd7f7ef609d 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 67f2552b434..543453a2bd3 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 ]; |