cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #59750 from worldofpeace/gsettings-desktop-schemas

Browse source 
gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas
This commit is contained in:
worldofpeace 2019-04-17 13:40:43 -04:00 committed by GitHub
commit 21d45fe6e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 86 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/programs/dconf.nix
View file

@ -38,7 +38,7 @@ in
"${pkgs.gnome3.dconf.lib}/lib/gio/modules"; "${pkgs.gnome3.dconf.lib}/lib/gio/modules";
# https://github.com/NixOS/nixpkgs/pull/31891 # https://github.com/NixOS/nixpkgs/pull/31891
#environment.variables.XDG_DATA_DIRS = optional cfg.enable #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-*)";
}; };
} }

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View file

@ -18,7 +18,7 @@ let
nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" { preferLocalBuild = true; } 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 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} ${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}

4
pkgs/applications/audio/radiotray-ng/default.nix
View file

@ -10,7 +10,7 @@
# GUI/Desktop # GUI/Desktop
, dbus , dbus
, glibmm , glibmm
, gnome3 , gsettings-desktop-schemas
, hicolor-icon-theme , hicolor-icon-theme
, libappindicator-gtk3 , libappindicator-gtk3
, libnotify , libnotify
@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
curl curl
boost jsoncpp libbsd pcre 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 libxdg_basedir
lsb-release lsb-release
wxGTK wxGTK

4
pkgs/applications/audio/sonata/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook { stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook
, python3Packages, gnome3, gtk3, gobject-introspection}: , python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }:
let let
inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2; inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2;
@ -20,7 +20,7 @@ in buildPythonApplication rec {
buildInputs = [ buildInputs = [
intltool wrapGAppsHook intltool wrapGAppsHook
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
postPatch = '' postPatch = ''

4
pkgs/applications/audio/sound-juicer/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero { stdenv, fetchurl, pkgconfig, glib, gtk3, intltool, itstool, libxml2, brasero
, libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes , libcanberra-gtk3, gnome3, gst_all_1, libmusicbrainz5, libdiscid, isocodes
, wrapGAppsHook }: , gsettings-desktop-schemas, wrapGAppsHook }:
let let
pname = "sound-juicer"; pname = "sound-juicer";
@ -16,7 +16,7 @@ in stdenv.mkDerivation rec{
nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig intltool itstool libxml2 wrapGAppsHook ];
buildInputs = [ buildInputs = [
glib gtk3 brasero libcanberra-gtk3 gnome3.adwaita-icon-theme 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.gstreamer gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
gst_all_1.gst-libav gst_all_1.gst-libav

4
pkgs/applications/graphics/glabels/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, barcode, gnome3, autoreconfHook { 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 , intltool, itstool, makeWrapper, pkgconfig, hicolor-icon-theme
}: }:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ]; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper intltool ];
buildInputs = [ buildInputs = [
barcode gtk3 gtk-doc gnome3.yelp-tools 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 itstool libxml2 librsvg libe-book libtool
hicolor-icon-theme hicolor-icon-theme
]; ];

3
pkgs/applications/graphics/shotwell/default.nix
View file

@ -32,6 +32,7 @@
, itstool , itstool
, libgdata , libgdata
, libchamplain , libchamplain
, gsettings-desktop-schemas
, python3 , python3
}: }:
@ -73,7 +74,7 @@ stdenv.mkDerivation rec {
libgee libgee
libgudev libgudev
gexiv2 gexiv2
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
libraw libraw
json-glib json-glib
glib glib

3
pkgs/applications/misc/notify-osd-customizable/default.nix
View file

@ -8,6 +8,7 @@
, libwnck3 , libwnck3
, makeWrapper , makeWrapper
, pkgconfig , pkgconfig
, gsettings-desktop-schemas
}: }:
let baseURI = "https://launchpad.net/~leolik/+archive/leolik"; let baseURI = "https://launchpad.net/~leolik/+archive/leolik";
@ -26,7 +27,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper glib libwnck3 libnotify dbus-glib makeWrapper
gnome3.gsettings-desktop-schemas gnome3.gnome-common gsettings-desktop-schemas gnome3.gnome-common
libtool libtool
]; ];

4
pkgs/applications/misc/notify-osd/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
name = "notify-osd-${version}"; name = "notify-osd-${version}";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
glib libwnck3 libnotify dbus-glib makeWrapper glib libwnck3 libnotify dbus-glib makeWrapper
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
configureFlags = [ "--libexecdir=$(out)/bin" ]; configureFlags = [ "--libexecdir=$(out)/bin" ];

4
pkgs/applications/networking/syncthing-gtk/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall { stdenv, fetchFromGitHub, fetchpatch, libnotify, librsvg, killall
, gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook , gtk3, libappindicator-gtk3, substituteAll, syncthing, wrapGAppsHook
, gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3 , gnome3, buildPythonApplication, dateutil, pyinotify, pygobject3
, bcrypt, gobject-introspection }: , bcrypt, gobject-introspection, gsettings-desktop-schemas }:
buildPythonApplication rec { buildPythonApplication rec {
version = "0.9.4"; version = "0.9.4";
@ -24,7 +24,7 @@ buildPythonApplication rec {
gtk3 librsvg libappindicator-gtk3 gtk3 librsvg libappindicator-gtk3
libnotify gnome3.adwaita-icon-theme libnotify gnome3.adwaita-icon-theme
# Schemas with proxy configuration # Schemas with proxy configuration
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

4
pkgs/applications/video/pitivi/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook { stdenv, fetchFromGitHub, fetchurl, pkgconfig, intltool, itstool, python3, wrapGAppsHook
, python3Packages, gst_all_1, gtk3 , python3Packages, gst_all_1, gtk3
, gobject-introspection, librsvg, gnome3, libnotify, gsound , gobject-introspection, librsvg, gnome3, libnotify, gsound
, meson, ninja , meson, ninja, gsettings-desktop-schemas
}: }:
let let
@ -49,7 +49,7 @@ in python3Packages.buildPythonApplication rec {
buildInputs = [ buildInputs = [
gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound gobject-introspection gtk3 librsvg gnome3.gnome-desktop gsound
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libnotify gsettings-desktop-schemas libnotify
gst-transcoder gst-transcoder
] ++ (with gst_all_1; [ ] ++ (with gst_all_1; [
gstreamer gst-editing-services gstreamer gst-editing-services

4
pkgs/desktops/gnome-3/apps/glade/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, intltool, fetchurl, python3 { stdenv, intltool, fetchurl, python3
, pkgconfig, gtk3, glib, gobject-introspection , pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, libxml2, docbook_xsl , wrapGAppsHook, itstool, libxml2, docbook_xsl
, gnome3, gdk_pixbuf, libxslt }: , gnome3, gdk_pixbuf, libxslt, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "glade-${version}"; name = "glade-${version}";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib libxml2 python3 python3.pkgs.pygobject3 gtk3 glib libxml2 python3 python3.pkgs.pygobject3
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme gdk_pixbuf gnome3.adwaita-icon-theme
]; ];

4
pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
View file

@ -4,7 +4,7 @@
, gnome-desktop, libzapojit, libgepub , gnome-desktop, libzapojit, libgepub
, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42 , gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
, gobject-introspection, inkscape, poppler_utils , gobject-introspection, inkscape, poppler_utils
, desktop-file-utils, wrapGAppsHook, python3 }: , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-documents-${version}"; name = "gnome-documents-${version}";
@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
inkscape poppler_utils # building getting started inkscape poppler_utils # building getting started
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas gtk3 glib gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme evince gdk_pixbuf gnome3.adwaita-icon-theme evince
libsoup webkitgtk gjs gobject-introspection libsoup webkitgtk gjs gobject-introspection
tracker tracker-miners libgdata tracker tracker-miners libgdata

4
pkgs/desktops/gnome-3/apps/gnome-logs/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook, desktop-file-utils { 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 { stdenv.mkDerivation rec {
name = "gnome-logs-${version}"; name = "gnome-logs-${version}";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils meson ninja pkgconfig wrapGAppsHook gettext itstool desktop-file-utils
libxml2 libxslt docbook_xsl docbook_xml_dtd_43 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 = '' postPatch = ''
chmod +x meson_post_install.py chmod +x meson_post_install.py

4
pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3 { stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
, gobject-introspection, gdk_pixbuf, librsvg, libgweather , 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 }: , webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
let let
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
gtk3 geoclue2 gjs libgee folks gfbgraph gtk3 geoclue2 gjs libgee folks gfbgraph
geocode-glib libchamplain libsoup geocode-glib libchamplain libsoup
gdk_pixbuf librsvg libgweather gdk_pixbuf librsvg libgweather
gnome3.gsettings-desktop-schemas evolution-data-server gsettings-desktop-schemas evolution-data-server
gnome-online-accounts gnome3.adwaita-icon-theme gnome-online-accounts gnome3.adwaita-icon-theme
webkitgtk webkitgtk
]; ];

4
pkgs/desktops/gnome-3/apps/gnome-music/default.nix
View file

@ -2,7 +2,7 @@
, libxml2, python3, libnotify, wrapGAppsHook, libmediaart , libxml2, python3, libnotify, wrapGAppsHook, libmediaart
, gobject-introspection, gnome-online-accounts, grilo, grilo-plugins , gobject-introspection, gnome-online-accounts, grilo, grilo-plugins
, pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib , 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 { python3.pkgs.buildPythonApplication rec {
pname = "gnome-music"; pname = "gnome-music";
@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
gtk3 glib libmediaart gnome-online-accounts gobject-introspection gtk3 glib libmediaart gnome-online-accounts gobject-introspection
gdk_pixbuf gnome3.adwaita-icon-theme python3 gdk_pixbuf gnome3.adwaita-icon-theme python3
grilo grilo-plugins libnotify libdazzle libsoup 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 gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
]; ];
propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ]; propagatedBuildInputs = with python3.pkgs; [ pycairo dbus-python pygobject3 ];

4
pkgs/desktops/gnome-3/apps/gnome-notes/default.nix
View file

@ -2,7 +2,7 @@
, wrapGAppsHook, itstool, desktop-file-utils, python3 , wrapGAppsHook, itstool, desktop-file-utils, python3
, glib, gtk3, evolution-data-server , glib, gtk3, evolution-data-server
, libuuid, webkitgtk, zeitgeist , libuuid, webkitgtk, zeitgeist
, gnome3, libxml2 }: , gnome3, libxml2, gsettings-desktop-schemas }:
let let
version = "3.32.1"; version = "3.32.1";
@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib gtk3 libuuid webkitgtk gnome3.tracker glib gtk3 libuuid webkitgtk gnome3.tracker
gnome3.gnome-online-accounts zeitgeist gnome3.gnome-online-accounts zeitgeist
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
evolution-data-server evolution-data-server
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
]; ];

4
pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
View file

@ -4,7 +4,7 @@
, grilo, gnome-online-accounts , grilo, gnome-online-accounts
, desktop-file-utils, wrapGAppsHook , desktop-file-utils, wrapGAppsHook
, gnome3, gdk_pixbuf, gexiv2, geocode-glib , gnome3, gdk_pixbuf, gexiv2, geocode-glib
, dleyna-renderer, dbus, meson, ninja, python3 }: , dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }:
let let
pname = "gnome-photos"; pname = "gnome-photos";
@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gegl babl libgdata libdazzle gtk3 glib gegl babl libgdata libdazzle
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme gdk_pixbuf gnome3.adwaita-icon-theme
gfbgraph grilo-plugins grilo gfbgraph grilo-plugins grilo
gnome-online-accounts tracker gnome-online-accounts tracker

4
pkgs/desktops/gnome-3/apps/gnome-weather/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs, gobject-introspection { 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 { stdenv.mkDerivation rec {
name = "gnome-weather-${version}"; name = "gnome-weather-${version}";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ];
buildInputs = [ buildInputs = [
gtk3 gjs gobject-introspection gnome-desktop 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 = '' postPatch = ''

4
pkgs/desktops/gnome-3/apps/polari/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme { stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
, telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
, pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib , pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib
, gnome3, wrapGAppsHook, telepathy-logger, gspell }: , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
let let
pname = "polari"; pname = "polari";
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ 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 telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup
]; ];

4
pkgs/desktops/gnome-3/apps/seahorse/default.nix
View file

@ -2,7 +2,7 @@
, pkgconfig, gtk3, glib, gobject-introspection , pkgconfig, gtk3, glib, gobject-introspection
, wrapGAppsHook, itstool, gnupg, libsoup , wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, gpgme, python3, openldap, gcr , gnome3, gpgme, python3, openldap, gcr
, libsecret, avahi, p11-kit, openssh }: , libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "seahorse"; pname = "seahorse";
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gcr gtk3 glib gcr
gnome3.gsettings-desktop-schemas gnupg gsettings-desktop-schemas gnupg
gnome3.adwaita-icon-theme gpgme gnome3.adwaita-icon-theme gpgme
libsecret avahi libsoup p11-kit libsecret avahi libsoup p11-kit
openssh openldap libpwquality openssh openldap libpwquality

4
pkgs/desktops/gnome-3/core/empathy/default.nix
View file

@ -6,7 +6,7 @@
, telepathy-logger, libnotify, clutter, libsoup, gnutls , telepathy-logger, libnotify, clutter, libsoup, gnutls
, evolution-data-server, yelp-xsl , evolution-data-server, yelp-xsl
, libcanberra-gtk3, p11-kit, farstream, libtool, shared-mime-info , 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 }: , isocodes, enchant, libchamplain, geoclue2, geocode-glib, cheese, libgudev }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
gcr libsecret libpulseaudio gdk_pixbuf gcr libsecret libpulseaudio gdk_pixbuf
libnotify clutter libsoup gnutls libgee p11-kit libnotify clutter libsoup gnutls libgee p11-kit
libcanberra-gtk3 telepathy-farstream farstream libcanberra-gtk3 telepathy-farstream farstream
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme gsettings-desktop-schemas
librsvg librsvg
# Spell-checking # Spell-checking
enchant isocodes enchant isocodes

4
pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib { stdenv, fetchurl, gnome3, meson, ninja, pkgconfig, gtk3, intltool, glib
, udev, itstool, libxml2, wrapGAppsHook, libnotify, libcanberra-gtk3, gobject-introspection , 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 let
pname = "gnome-bluetooth"; pname = "gnome-bluetooth";
@ -22,7 +22,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
glib gtk3 udev libnotify libcanberra-gtk3 glib gtk3 udev libnotify libcanberra-gtk3
gnome3.adwaita-icon-theme gnome3.gsettings-desktop-schemas gnome3.adwaita-icon-theme gsettings-desktop-schemas
]; ];
mesonFlags = [ mesonFlags = [

4
pkgs/desktops/gnome-3/core/gnome-calculator/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2 { stdenv, meson, ninja, vala, gettext, itstool, fetchurl, pkgconfig, libxml2
, gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3 , gtk3, glib, gtksourceview4, wrapGAppsHook, gobject-introspection, python3
, gnome3, mpfr, gmp, libsoup, libmpc }: , gnome3, mpfr, gmp, libsoup, libmpc, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-calculator-${version}"; name = "gnome-calculator-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib libxml2 gtksourceview4 mpfr gmp gtk3 glib libxml2 gtksourceview4 mpfr gmp
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas libsoup libmpc gsettings-desktop-schemas libsoup libmpc
]; ];
doCheck = true; doCheck = true;

4
pkgs/desktops/gnome-3/core/gnome-contacts/default.nix
View file

@ -2,7 +2,7 @@
, pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese , pkgconfig, libxslt, docbook_xsl, docbook_xml_dtd_42, python3, gtk3, glib, cheese
, libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts , libchamplain, clutter-gtk, geocode-glib, gnome-desktop, gnome-online-accounts
, wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib , wrapGAppsHook, folks, libxml2, gnome3, telepathy-glib
, vala, meson, ninja, libhandy }: , vala, meson, ninja, libhandy, gsettings-desktop-schemas }:
let let
version = "3.32"; version = "3.32";
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
gtk3 glib evolution-data-server gnome3.gsettings-desktop-schemas gtk3 glib evolution-data-server gsettings-desktop-schemas
folks gnome-desktop telepathy-glib libhandy folks gnome-desktop telepathy-glib libhandy
libxml2 gnome-online-accounts cheese libxml2 gnome-online-accounts cheese
gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib gnome3.adwaita-icon-theme libchamplain clutter-gtk geocode-glib

4
pkgs/desktops/gnome-3/core/gnome-desktop/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib { stdenv, fetchurl, substituteAll, pkgconfig, libxslt, ninja, libX11, gnome3, gtk3, glib
, gettext, libxml2, xkeyboard_config, isocodes, meson, wayland, fetchpatch , 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 { stdenv.mkDerivation rec {
name = "gnome-desktop-${version}"; name = "gnome-desktop-${version}";
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
gtk3 glib libseccomp gtk3 glib libseccomp
]; ];
propagatedBuildInputs = [ gnome3.gsettings-desktop-schemas ]; propagatedBuildInputs = [ gsettings-desktop-schemas ];
patches = [ patches = [
(substituteAll { (substituteAll {

4
pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt { stdenv, fetchurl, meson, ninja, pkgconfig, desktop-file-utils, appstream-glib, libxslt
, libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43 , libxml2, gettext, itstool, wrapGAppsHook, docbook_xsl, docbook_xml_dtd_43
, gnome3, gtk3, glib }: , gnome3, gtk3, glib, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gnome-dictionary-${version}"; name = "gnome-dictionary-${version}";
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool meson ninja pkgconfig wrapGAppsHook libxml2 gettext itstool
desktop-file-utils appstream-glib libxslt docbook_xsl docbook_xml_dtd_43 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 = { passthru = {
updateScript = gnome3.updateScript { updateScript = gnome3.updateScript {

4
pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread { stdenv, gettext, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
, meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify , meson, ninja, gtk3, glib, wrapGAppsHook, python3, libnotify
, itstool, gnome3, libxml2 , itstool, gnome3, libxml2, gsettings-desktop-schemas
, libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }: , libcanberra-gtk3, libxslt, docbook_xsl, libpwquality }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3 gtk3 glib libsecret libpwquality libnotify libdvdread libcanberra-gtk3
udisks2 gnome3.adwaita-icon-theme udisks2 gnome3.adwaita-icon-theme
gnome3.gnome-settings-daemon gnome3.gsettings-desktop-schemas gnome3.gnome-settings-daemon gsettings-desktop-schemas
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3 { stdenv, gettext, libxml2, fetchurl, pkgconfig, libcanberra-gtk3
, gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils , gtk3, glib, meson, ninja, python3, wrapGAppsHook, appstream-glib, desktop-file-utils
, gnome3 }: , gnome3, gsettings-desktop-schemas }:
let let
pname = "gnome-screenshot"; pname = "gnome-screenshot";
@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ]; nativeBuildInputs = [ meson ninja pkgconfig gettext appstream-glib libxml2 desktop-file-utils python3 wrapGAppsHook ];
buildInputs = [ buildInputs = [
gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme gtk3 glib libcanberra-gtk3 gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
passthru = { passthru = {

4
pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit { stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
, bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3 , 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 { stdenv.mkDerivation rec {
name = "gnome-system-monitor-${version}"; name = "gnome-system-monitor-${version}";
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = [ buildInputs = [
bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
gnome3.gsettings-desktop-schemas systemd gsettings-desktop-schemas systemd
]; ];
postPatch = '' postPatch = ''

4
pkgs/desktops/gnome-3/core/nautilus/default.nix
View file

@ -2,7 +2,7 @@
, desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar , desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
, glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf , librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
, substituteAll, bubblewrap, gst_all_1 , substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
}: }:
let let
@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux glib-networking shared-mime-info libexif gtk3 exempi libnotify libselinux
tracker tracker-miners gexiv2 libseccomp bubblewrap gst_all_1.gst-plugins-base 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 ]; propagatedBuildInputs = [ gnome-autoar ];

5
pkgs/desktops/gnome-3/default.nix
View file

@ -84,7 +84,7 @@ lib.makeScope pkgs.newScope (self: with self; {
gjs = callPackage ./core/gjs { }; gjs = callPackage ./core/gjs { };
glib-networking = pkgs.glib-networking.override { glib-networking = pkgs.glib-networking.override {
inherit gsettings-desktop-schemas; inherit (pkgs) gsettings-desktop-schemas;
}; };
gnome-backgrounds = callPackage ./core/gnome-backgrounds { }; gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
@ -145,8 +145,6 @@ lib.makeScope pkgs.newScope (self: with self; {
grilo-plugins = callPackage ./core/grilo-plugins { }; grilo-plugins = callPackage ./core/grilo-plugins { };
gsettings-desktop-schemas = callPackage ./core/gsettings-desktop-schemas { };
gucharmap = callPackage ./core/gucharmap { }; gucharmap = callPackage ./core/gucharmap { };
gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; }; 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 libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage 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; 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; defaultIconTheme = adwaita-icon-theme;
gtk = gtk3; gtk = gtk3;
gtkmm = gtkmm3; gtkmm = gtkmm3;

4
pkgs/desktops/gnome-3/devtools/anjuta/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool, { stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
gdl, libgda, gtksourceview, gdl, libgda, gtksourceview, gsettings-desktop-schemas,
itstool, python3, ncurses, makeWrapper }: itstool, python3, ncurses, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
flex bison gtk3 libxml2 gnome3.gjs gdl flex bison gtk3 libxml2 gnome3.gjs gdl
libgda gtksourceview libgda gtksourceview
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
preFixup = '' preFixup = ''

4
pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, meson, ninja, gettext, fetchurl { stdenv, meson, ninja, gettext, fetchurl
, pkgconfig, gtk3, glib, libsoup , pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
, itstool, libxml2, python3Packages , itstool, libxml2, python3Packages
, gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }: , gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python meson ninja pkgconfig gettext itstool libxml2 wrapGAppsHook python3Packages.python
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gnome3.gsettings-desktop-schemas gtk3 glib gsettings-desktop-schemas
gdk_pixbuf gnome3.adwaita-icon-theme gdk_pixbuf gnome3.adwaita-icon-theme
libnotify gnome3.gnome-shell python3Packages.pygobject3 libnotify gnome3.gnome-shell python3Packages.pygobject3
libsoup gnome3.gnome-settings-daemon gnome3.nautilus libsoup gnome3.gnome-settings-daemon gnome3.nautilus

4
pkgs/desktops/gnome-3/misc/gtkhtml/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool { stdenv, fetchurl, pkgconfig, gtk3, intltool
, gnome3, enchant, isocodes }: , gnome3, enchant, isocodes, gsettings-desktop-schemas }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gtkhtml-${version}"; name = "gtkhtml-${version}";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ]; nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme buildInputs = [ gtk3 intltool gnome3.adwaita-icon-theme
gnome3.gsettings-desktop-schemas ]; gsettings-desktop-schemas ];
propagatedBuildInputs = [ enchant isocodes ]; propagatedBuildInputs = [ enchant isocodes ];

6
pkgs/desktops/pantheon/desktop/elementary-gsettings-schemas/default.nix
View file

@ -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 ? "" , extraGSettingsOverrides ? ""
, extraGSettingsOverridePackages ? [] , extraGSettingsOverridePackages ? []
}: }:
@ -9,7 +9,7 @@ let
elementary-settings-daemon elementary-settings-daemon
epiphany epiphany
gala gala
gnome3.mutter mutter
gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
plank plank
@ -23,7 +23,7 @@ with stdenv.lib;
runCommand "elementary-gsettings-desktop-schemas" {} runCommand "elementary-gsettings-desktop-schemas" {}
'' ''
mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/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} ${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}

4
pkgs/development/libraries/flatpak/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2 { 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 , 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 , 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 { stdenv.mkDerivation rec {
pname = "flatpak"; pname = "flatpak";
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp bubblewrap bzip2 dbus gnome3.dconf glib gpgme json-glib libarchive libcap libseccomp
libsoup lzma ostree polkit python3 systemd xorg.libXau libsoup lzma ostree polkit python3 systemd xorg.libXau
gnome3.gsettings-desktop-schemas glib-networking gsettings-desktop-schemas glib-networking
]; ];
checkInputs = [ valgrind ]; checkInputs = [ valgrind ];

0
pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix → pkgs/development/libraries/gsettings-desktop-schemas/default.nix
View file

4
pkgs/development/libraries/gtk+/3.x.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes { stdenv, fetchurl, fetchpatch, pkgconfig, gettext, perl, makeWrapper, shared-mime-info, isocodes
, expat, glib, cairo, pango, gdk_pixbuf, atk, at-spi2-atk, gobject-introspection, fribidi , 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 , x11Support ? stdenv.isLinux
, waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols , waylandSupport ? stdenv.isLinux, mesa_noglu, wayland, wayland-protocols
, xineramaSupport ? stdenv.isLinux , xineramaSupport ? stdenv.isLinux
@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libxkbcommon epoxy json-glib isocodes ] buildInputs = [ libxkbcommon epoxy json-glib isocodes ]
++ optional stdenv.isDarwin AppKit; ++ optional stdenv.isDarwin AppKit;
propagatedBuildInputs = with xorg; with stdenv.lib; 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 ] libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed ++ optional stdenv.isDarwin Cocoa # explicitly propagated, always needed
++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ] ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]

4
pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
View file

@ -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 { stdenv.mkDerivation rec {
pname = "xdg-desktop-portal-gtk"; pname = "xdg-desktop-portal-gtk";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ]; 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; { meta = with stdenv.lib; {
description = "Desktop integration portals for sandboxed apps"; description = "Desktop integration portals for sandboxed apps";

4
pkgs/tools/audio/pasystray/default.nix
View file

@ -1,6 +1,6 @@
{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, wrapGAppsHook
, gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio , gnome3, avahi, gtk3, libappindicator-gtk3, libnotify, libpulseaudio
, xlibsWrapper , xlibsWrapper, gsettings-desktop-schemas
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
gnome3.adwaita-icon-theme gnome3.adwaita-icon-theme
avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper avahi gtk3 libappindicator-gtk3 libnotify libpulseaudio xlibsWrapper
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
]; ];
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/tools/security/keybase/gui.nix
View file

@ -1,7 +1,7 @@
{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev, hicolor-icon-theme
, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3 , dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3, gnome3
, libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
, runtimeShell }: , runtimeShell, gsettings-desktop-schemas }:
let let
versionSuffix = "20190205202117.6394d03e6c"; versionSuffix = "20190205202117.6394d03e6c";
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
freetype freetype
gdk_pixbuf gdk_pixbuf
glib glib
gnome3.gsettings-desktop-schemas gsettings-desktop-schemas
gtk3 gtk3
libnotify libnotify
nspr nspr

15
pkgs/top-level/all-packages.nix
View file

@ -5358,9 +5358,7 @@ in
remind = callPackage ../tools/misc/remind { }; remind = callPackage ../tools/misc/remind { };
remmina = callPackage ../applications/networking/remote/remmina { remmina = callPackage ../applications/networking/remote/remmina { };
gsettings-desktop-schemas = gnome3.gsettings-desktop-schemas;
};
rename = callPackage ../tools/misc/rename { }; rename = callPackage ../tools/misc/rename { };
@ -15934,7 +15932,7 @@ in
gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { }; 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 { }; go-font = callPackage ../data/fonts/go-font { };
@ -16772,7 +16770,6 @@ in
cinelerra = callPackage ../applications/video/cinelerra { }; cinelerra = callPackage ../applications/video/cinelerra { };
claws-mail = callPackage ../applications/networking/mailreaders/claws-mail { claws-mail = callPackage ../applications/networking/mailreaders/claws-mail {
inherit (gnome3) gsettings-desktop-schemas;
inherit (xorg) libSM; inherit (xorg) libSM;
}; };
@ -18428,7 +18425,7 @@ in
libvmi = callPackage ../development/libraries/libvmi { }; libvmi = callPackage ../development/libraries/libvmi { };
liferea = callPackage ../applications/networking/newsreaders/liferea { liferea = callPackage ../applications/networking/newsreaders/liferea {
inherit (gnome3) gsettings-desktop-schemas dconf; inherit (gnome3) dconf;
}; };
lightworks = callPackage ../applications/video/lightworks { lightworks = callPackage ../applications/video/lightworks {
@ -20731,9 +20728,7 @@ in
openssl = null; openssl = null;
}; };
roxterm = callPackage ../applications/misc/roxterm { roxterm = callPackage ../applications/misc/roxterm { };
inherit (gnome3) gsettings-desktop-schemas;
};
termonad-with-packages = callPackage ../applications/misc/termonad { termonad-with-packages = callPackage ../applications/misc/termonad {
inherit (haskellPackages) ghcWithPackages; inherit (haskellPackages) ghcWithPackages;
@ -21777,8 +21772,8 @@ in
mkPlasma5 = import ../desktops/plasma-5; mkPlasma5 = import ../desktops/plasma-5;
attrs = { attrs = {
inherit libsForQt5 lib fetchurl; inherit libsForQt5 lib fetchurl;
inherit (gnome3) gsettings-desktop-schemas;
gconf = gnome2.GConf; gconf = gnome2.GConf;
inherit gsettings-desktop-schemas;
}; };
in in
recurseIntoAttrs (makeOverridable mkPlasma5 attrs); recurseIntoAttrs (makeOverridable mkPlasma5 attrs);