about summary refs log tree commit diff
path: root/pkgs/desktops/gnome-3/3.12/core/gnome-control-center
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/desktops/gnome-3/3.12/core/gnome-control-center')
-rw-r--r--pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix60
-rw-r--r--pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch17
-rw-r--r--pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch19
3 files changed, 0 insertions, 96 deletions
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
deleted file mode 100644
index 4a394b3b8975..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, accountsservice, libpwquality, pulseaudio, fontconfig
-, gdk_pixbuf, hicolor_icon_theme, librsvg, libxkbfile, libnotify
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, krb5, networkmanagerapplet, networkmanager
-, libwacom, samba, shared_mime_info, tzdata, icu, libtool
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk }:
-
-# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: bluetooth, wacom, smbclient, printers
-
-stdenv.mkDerivation rec {
-  name = "gnome-control-center-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-control-center/3.12/${name}.tar.xz";
-    sha256 = "5297d448eff0ec58f6c0ad9fbd1b94bed0a850496df0ee65571c0622b49c1582";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
-
-  enableParallelBuilding = true;
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
-      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
-      gnome_online_accounts libsoup colord pulseaudio fontconfig colord-gtk libpwquality
-      accountsservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
-      gdk_pixbuf gnome3.gnome_icon_theme librsvg clutter clutter_gtk
-      hicolor_icon_theme gnome3.gnome_icon_theme_symbolic gnome3.vino
-      networkmanager modemmanager makeWrapper  ];
-
-  preBuild = ''
-    substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-
-    # hack to make test-endianess happy
-    mkdir -p $out/share/locale
-    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram $out/bin/gnome-control-center \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    for i in $out/share/applications/*; do
-      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
-    done
-  '';
-
-  patches = [ ./search_providers_dir.patch ./vpn_plugins_path.patch ];
-
-  meta = with stdenv.lib; {
-    description = "Single sign-on framework for GNOME";
-    maintainers = with maintainers; [ lethalman ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
deleted file mode 100644
index 7f5ad970f34e..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/search_providers_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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,
diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
deleted file mode 100644
index e25105a303f4..000000000000
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-control-center/vpn_plugins_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
-index 7dc23c2..fcb1384 100644
---- a/panels/network/connection-editor/vpn-helpers.c
-+++ b/panels/network/connection-editor/vpn-helpers.c
-@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
- 		if (!so_path)
- 			goto next;
- 
--		/* Remove any path and extension components, then reconstruct path
--		 * to the SO in LIBDIR
--		 */
--		so_name = g_path_get_basename (so_path);
--		g_free (so_path);
--		so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
--		g_free (so_name);
--
- 		module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- 		if (!module) {
- 			g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "