diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2014-04-17 17:31:18 +0200 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2014-04-17 17:32:20 +0200 |
commit | 1942d9cadc339b3e2ee85486949f128e396bc874 (patch) | |
tree | e14d840d83659c6269d84ebb69eb61acfcaa8e7e /pkgs/desktops/gnome-3/core/gnome-control-center | |
parent | f2cb4def59802c35ccc65b330715ac8c0a7cd277 (diff) | |
download | nixpkgs-1942d9cadc339b3e2ee85486949f128e396bc874.tar nixpkgs-1942d9cadc339b3e2ee85486949f128e396bc874.tar.gz nixpkgs-1942d9cadc339b3e2ee85486949f128e396bc874.tar.bz2 nixpkgs-1942d9cadc339b3e2ee85486949f128e396bc874.tar.lz nixpkgs-1942d9cadc339b3e2ee85486949f128e396bc874.tar.xz nixpkgs-1942d9cadc339b3e2ee85486949f128e396bc874.tar.zst nixpkgs-1942d9cadc339b3e2ee85486949f128e396bc874.zip |
gnome-control-center: find gnome-shell search providers
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-control-center')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 2 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch | 17 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index ac8b362839c..1222f03d66e 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -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 ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch new file mode 100644 index 00000000000..7f5ad970f34 --- /dev/null +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch @@ -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, |