diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2014-05-18 21:08:04 +0200 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2014-05-20 13:41:33 +0200 |
commit | d05fa3ccfeafbf81e514a82cf2f04fff2b03659b (patch) | |
tree | 06daeb89a6b398fa369a45a37f995b0dccc67d6a /pkgs/desktops/gnome-3/core/gnome-control-center | |
parent | 139608dd34414ae63e6679d34436588029d463b0 (diff) | |
download | nixpkgs-d05fa3ccfeafbf81e514a82cf2f04fff2b03659b.tar nixpkgs-d05fa3ccfeafbf81e514a82cf2f04fff2b03659b.tar.gz nixpkgs-d05fa3ccfeafbf81e514a82cf2f04fff2b03659b.tar.bz2 nixpkgs-d05fa3ccfeafbf81e514a82cf2f04fff2b03659b.tar.lz nixpkgs-d05fa3ccfeafbf81e514a82cf2f04fff2b03659b.tar.xz nixpkgs-d05fa3ccfeafbf81e514a82cf2f04fff2b03659b.tar.zst nixpkgs-d05fa3ccfeafbf81e514a82cf2f04fff2b03659b.zip |
Branch gnome 3.12
Diffstat (limited to 'pkgs/desktops/gnome-3/core/gnome-control-center')
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 62 | ||||
-rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-control-center/search_providers_dir.patch | 17 |
2 files changed, 0 insertions, 79 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 deleted file mode 100644 index 1222f03d66e..00000000000 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, accountservice, 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 }: - -# 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.10.2"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-control-center/3.10/${name}.tar.xz"; - sha256 = "1ac34kqkf174w0qc12p927dfhcm69xnv7fqzmbhjab56rn49wypn"; - }; - - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard gnome3.libgnomekbd ]; - propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg - hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ]; - - 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 - accountservice krb5 networkmanagerapplet libwacom samba libnotify libxkbfile - shared_mime_info icu libtool docbook_xsl docbook_xsl_ns - 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:${gnome_settings_daemon}/share:${glib}/share:${gtk}/share:${colord}/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 - - 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 ]; - platforms = platforms.linux; - }; - -} 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 deleted file mode 100644 index 7f5ad970f34..00000000000 --- a/pkgs/desktops/gnome-3/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, |