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

Merge pull request #2302 from lethalman/gnome3

Browse Source 
gnome-control-center: find gnome-shell search providers
This commit is contained in:
Domen Kožar 2014-04-18 09:39:10 +02:00
commit 14cdaec895
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -68,6 +68,9 @@ in {
# Don't let epiphany depend upon gnome-shell
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${pkgs.gnome3.gnome_shell}/share/gsettings-schemas/${pkgs.gnome3.gnome_shell.name}
# Let gnome-control-center find gnome-shell search providers
export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
# Update user dirs as described in http://freedesktop.org/wiki/Software/xdg-user-dirs/
${pkgs.xdg-user-dirs}/bin/xdg-user-dirs-update

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

@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
rm $out/share/icons/hicolor/icon-theme.cache
'';
patches = [ ./search_providers_dir.patch ];
meta = with stdenv.lib; {
description = "Single sign-on framework for GNOME";
maintainers = with maintainers; [ lethalman ];

17
pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch Normal file
View File

@ -0,0 +1,17 @@
diff --git a/panels/search/cc-search-panel.c b/panels/search/cc-search-panel.c
index d08e230..3bff4ad 100644
--- a/panels/search/cc-search-panel.c
+++ b/panels/search/cc-search-panel.c
@@ -574,7 +574,11 @@ populate_search_providers (CcSearchPanel *self)
{
GFile *providers_location;
- providers_location = g_file_new_for_path (DATADIR "/gnome-shell/search-providers");
+ const gchar* search_providers_dir = g_getenv ("GNOME_SEARCH_PROVIDERS_DIR");
+ if (search_providers_dir == NULL) {
+ search_providers_dir = DATADIR "/gnome-shell/search-providers";
+ }
+ providers_location = g_file_new_for_path (search_providers_dir);
g_file_enumerate_children_async (providers_location,
"standard::type,standard::name,standard::content-type",
G_FILE_QUERY_INFO_NONE,