public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnome: Fix the issue Using the 'memory' GSettings backend issue

Browse Source
This commit is contained in:
midchildan 2017-05-26 16:00:58 +09:00 committed by Robin Gloster
parent 7d0b001d4a
commit 0e192d5d4f
7 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
View File

@ -32,6 +32,10 @@ in stdenv.mkDerivation rec {
configureFlags = [ "--disable-pst-import" "--disable-autoar" configureFlags = [ "--disable-pst-import" "--disable-autoar"
"--disable-libcryptui" "--with-openldap"]; "--disable-libcryptui" "--with-openldap"];
preFixup = ''
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES "${dconf}/lib/gio/modules")
'';
NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true; enableParallelBuilding = true;

13
pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, vala_0_32 { stdenv, intltool, fetchurl, vala_0_32
, pkgconfig, gtk3, glib , pkgconfig, gtk3, glib
, makeWrapper, itstool, gnupg, libsoup , wrapGAppsHook, itstool, gnupg, libsoup
, gnome3, librsvg, gdk_pixbuf, gpgme , gnome3, librsvg, gdk_pixbuf, gpgme
, libsecret, avahi, p11_kit, openssh }: , libsecret, avahi, p11_kit, openssh }:
@ -14,15 +14,16 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
gnome3.gsettings_desktop_schemas makeWrapper gnupg gnome3.gsettings_desktop_schemas wrapGAppsHook gnupg
gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
libsecret avahi libsoup p11_kit vala_0_32 gnome3.gcr libsecret avahi libsoup p11_kit vala_0_32 gnome3.dconf
openssh ]; openssh ];
preFixup = '' preFixup = ''
wrapProgram "$out/bin/seahorse" \ gappsWrapperArgs+=(
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
)
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

15
pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
View File

@ -1,7 +1,7 @@
{ stdenv, intltool, fetchurl, evolution_data_server, db { stdenv, intltool, fetchurl, evolution_data_server, db
, pkgconfig, gtk3, glib, libsecret , pkgconfig, gtk3, glib, libsecret
, libchamplain, clutter_gtk, geocode_glib , libchamplain, clutter_gtk, geocode_glib
, bash, makeWrapper, itstool, folks, libnotify, libxml2 , bash, wrapGAppsHook, itstool, folks, libnotify, libxml2
, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss , gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
, libsoup, vala_0_32, dbus_glib, automake115x, autoconf }: , libsoup, vala_0_32, dbus_glib, automake115x, autoconf }:
@ -18,19 +18,18 @@ stdenv.mkDerivation rec {
''; '';
buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
gnome3.gsettings_desktop_schemas makeWrapper file libnotify gnome3.gsettings_desktop_schemas wrapGAppsHook file libnotify
folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
libxml2 libsoup gnome3.gnome_online_accounts nspr nss libxml2 libsoup gnome3.gnome_online_accounts nspr nss
gdk_pixbuf gnome3.defaultIconTheme librsvg gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.dconf
libchamplain clutter_gtk geocode_glib libchamplain clutter_gtk geocode_glib
vala_0_32 automake115x autoconf db ]; vala_0_32 automake115x autoconf db ];
preFixup = '' preFixup = ''
for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do gappsWrapperArgs+=(
wrapProgram $f \ --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" )
done
''; '';
patches = [ ./gio_unix.patch ]; patches = [ ./gio_unix.patch ];

6
pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook gnome3.dconf gnome3.vino udev libcanberra_gtk3 libgudev wrapGAppsHook
networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker networkmanager modemmanager gnome3.gnome-bluetooth grilo tracker
cracklib ]; cracklib ];
@ -39,6 +39,10 @@ stdenv.mkDerivation rec {
''; '';
preFixup = with gnome3; '' preFixup = with gnome3; ''
gappsWrapperArgs+=(
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share/gnome-control-center"
)
for i in $out/share/applications/*; do for i in $out/share/applications/*; do
substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center" substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
done done

6
pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
View File

@ -11,11 +11,15 @@ stdenv.mkDerivation rec {
buildInputs = with gnome3; buildInputs = with gnome3;
[ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio dconf libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
libcanberra_gtk3 upower colord libgweather xkeyboard_config libcanberra_gtk3 upower colord libgweather xkeyboard_config
polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ]; libtool docbook_xsl docbook_xsl_ns wrapGAppsHook gnome_themes_standard ];
preFixup = with gnome3; ''
gappsWrapperArgs+=(--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules")
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
platforms = platforms.linux; platforms = platforms.linux;
maintainers = gnome3.maintainers; maintainers = gnome3.maintainers;

4
pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
View File

@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
libgweather # not declared at build time, but typelib is needed at runtime libgweather # not declared at build time, but typelib is needed at runtime
gnome3.gnome-clocks # schemas needed gnome3.gnome-clocks # schemas needed
at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
pythonEnv gobjectIntrospection ]; pythonEnv gobjectIntrospection dconf ];
installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ]; installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
@ -39,11 +39,13 @@ in stdenv.mkDerivation rec {
wrapProgram "$out/bin/gnome-shell" \ wrapProgram "$out/bin/gnome-shell" \
--prefix PATH : "${unzip}/bin" \ --prefix PATH : "${unzip}/bin" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \ --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
--suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
wrapProgram "$out/libexec/gnome-shell-calendar-server" \ wrapProgram "$out/libexec/gnome-shell-calendar-server" \
--prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
--prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path

15
pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, intltool, fetchurl, libxml2, upower { stdenv, intltool, fetchurl, libxml2, upower
, pkgconfig, gtk3, glib , pkgconfig, gtk3, glib
, bash, makeWrapper, itstool, vala_0_32, sqlite, libxslt , bash, wrapGAppsHook, itstool, vala_0_32, sqlite, libxslt
, gnome3, librsvg, gdk_pixbuf, file, libnotify , gnome3, librsvg, gdk_pixbuf, file, libnotify
, evolution_data_server, gst_all_1, poppler , evolution_data_server, gst_all_1, poppler
, icu, taglib, libjpeg, libtiff, giflib, libcue , icu, taglib, libjpeg, libtiff, giflib, libcue
@ -19,8 +19,8 @@ stdenv.mkDerivation rec {
buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2 buildInputs = [ vala_0_32 pkgconfig gtk3 glib intltool itstool libxml2
bzip2 gnome3.totem-pl-parser libxslt bzip2 gnome3.totem-pl-parser libxslt
gnome3.gsettings_desktop_schemas makeWrapper file gnome3.gsettings_desktop_schemas gnome3.dconf wrapGAppsHook
gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite file gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
upower libnotify evolution_data_server gnome3.libgee upower libnotify evolution_data_server gnome3.libgee
gst_all_1.gstreamer gst_all_1.gst-plugins-base flac gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
poppler icu taglib libjpeg libtiff giflib libvorbis poppler icu taglib libjpeg libtiff giflib libvorbis
@ -31,11 +31,10 @@ stdenv.mkDerivation rec {
''; '';
preFixup = '' preFixup = ''
for f in $out/bin/* $out/libexec/*; do gappsWrapperArgs+=(
wrapProgram $f \ --prefix GIO_EXTRA_MODULES "${gnome3.dconf}/lib/gio/modules"
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share"
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" )
done
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {