Drop GNOME 3.12

2024-11-02 07:31:26 +00:00 · 2015-05-18 10:48:05 +02:00 · 2015-05-18 10:48:05 +02:00 · 25f9555599
commit 25f9555599
parent baf8061cd7
125 changed files with 23 additions and 4254 deletions
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@ -45,7 +45,7 @@ in {

    environment.gnome3.packageSet = mkOption {
      default = null;
-      example = literalExample "pkgs.gnome3_12";
+      example = literalExample "pkgs.gnome3_16";
      description = "Which GNOME 3 package set to use.";
      apply = p: if p == null then pkgs.gnome3 else p;
    };
@ -109,9 +109,6 @@ in {
          # Override default mimeapps
          export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share

-          # Let gnome-control-center find gnome-shell search providers. GNOME 3.12 compatibility.
-          export GNOME_SEARCH_PROVIDERS_DIR=${config.system.path}/share/gnome-shell/search-providers/
-
          # Let nautilus find extensions
          export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/

--- a/nixos/tests/gnome3_16.nix
+++ b/nixos/tests/gnome3_16.nix
@ -1,34 +0,0 @@
-import ./make-test.nix {
-  name = "gnome3";
-
-  machine =
-    { config, pkgs, ... }:
-
-    { imports = [ ./common/user-account.nix ];
-
-      services.xserver.enable = true;
-
-      services.xserver.displayManager.auto.enable = true;
-      services.xserver.displayManager.auto.user = "alice";
-      services.xserver.desktopManager.gnome3.enable = true;
-
-      environment.gnome3.packageSet = pkgs.gnome3_16;
-
-      virtualisation.memorySize = 512;
-    };
-
-  testScript =
-    ''
-      $machine->waitForX;
-      $machine->sleep(15);
-
-      # Check that logging in has given the user ownership of devices.
-      $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-
-      $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
-      $machine->waitForWindow(qr/Terminal/);
-      $machine->sleep(20);
-      $machine->screenshot("screen");
-    '';
-
-}
--- a/pkgs/applications/video/byzanz/default.nix
+++ b/pkgs/applications/video/byzanz/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchgit, which, gnome3_12, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }:
+{ stdenv, fetchgit, which, gnome3, glib, intltool, pkgconfig, libtool, cairo, gtk3, gst_all_1 }:

 stdenv.mkDerivation rec {
  version = "0.2.3.alpha";
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
    ./autogen.sh --prefix=$out
  '';

-  buildInputs = [ which gnome3_12.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  buildInputs = [ which gnome3.gnome_common glib intltool pkgconfig libtool cairo gtk3 gst_all_1.gstreamer gst_all_1.gst-plugins-base ];

  meta = with stdenv.lib; {
    description = "Tool to record a running X desktop to an animation suitable for presentation in a web browser";
--- a/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, hicolor_icon_theme, makeWrapper, itstool, desktop_file_utils
-, clutter_gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "bijiben-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/bijiben/3.12/${name}.tar.xz";
-    sha256 = "f319ef2a5b69ff9368e7488a28453da0f10eaa39a0f8e5d74623d0c07c824708";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig glib intltool itstool libxml2
-                  clutter_gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/bijiben" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
-    description = "Note editor designed to remain simple to use";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix
@ -1,50 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight, sqlite
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libnotify, gtkspell3
-, makeWrapper, itstool, shared_mime_info, libical, db, gcr
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
-
-stdenv.mkDerivation rec {
-  name = "evolution-3.12.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz";
-    sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg db icu
-                  gnome3.evolution_data_server libsecret libical gcr
-                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
-                  libcanberra_gtk3 gnome3.gtkhtml bogofilter gnome3.libgdata
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  nss nspr libnotify procps highlight gnome3.libgweather
-                  gnome3.gsettings_desktop_schemas makeWrapper sqlite ];
-
-  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Evolution;
-    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
@ -1,33 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "file-roller-${version}";
-
-  majVersion = "3.12";
-  version = "${majVersion}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
-    sha256 = "0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf";
-  };
-
-  # TODO: support nautilus
-  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-
-  buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
-                  hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-                  attr bzip2 acl gdk_pixbuf librsvg makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/file-roller" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/FileRoller;
-    description = "Archive manager for the GNOME desktop environment";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix
@ -1,39 +0,0 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gedit-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz";
-    sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libsoup
-                  gnome3.libpeas gnome3.gtksourceview libxml2
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gedit" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gedit;
-    description = "Official text editor of the GNOME desktop environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libxml2, docbook_xsl
-, gnome3, librsvg, gdk_pixbuf, libxslt }:
-
-stdenv.mkDerivation rec {
-  name = "glade-3.16.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
-    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
-                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg libxslt
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/glade" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Glade;
-    description = "User interface designer for GTK+ applications";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
@ -1,46 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, hicolor_icon_theme, desktop_file_utils, mtools, cdrkit, libcdio
-}:
-
-# TODO: ovirt (optional)
-
-stdenv.mkDerivation rec {
-  name = "gnome-boxes-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-boxes/3.12/${name}.tar.xz";
-    sha256 = "0kzdh8kk9isaskbfyj7r7nybgdyhj7i4idkgahdsl9xs9sj2pmc8";
-  };
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  buildInputs = [
-    makeWrapper pkgconfig intltool itstool libvirt-glib glib
-    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
-    libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-    librsvg hicolor_icon_theme desktop_file_utils
-  ];
-
-  preFixup = ''
-    for prog in "$out/bin/"*; do
-        wrapProgram "$prog" \
-            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-            --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Simple GNOME 3 application to access remote or virtual systems";
-    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libcanberra_gtk3, libtool
-, gnome3, librsvg, gdk_pixbuf, geoclue2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-clocks-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/3.12/${name}.tar.xz";
-    sha256 = "3fc0ce2b7b2540d6c2d791ff63ab1670f189a339c804fcf24c9010a478314604";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
-                  libgweather libnotify libtool
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-clocks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Clocks;
-    description = "Clock application designed for GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
@ -1,56 +0,0 @@
-{ stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, libxslt, webkitgtk
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json_glib
-, gmp, desktop_file_utils }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-documents-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/3.12/${name}.tar.xz";
-    sha256 = "6d0df1d90781d56992ed5d5c2591833e89e3aa756ccab63f82dd935185ce5a53";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
-                  docbook_xsl desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg evince
-                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
-                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
-                  gnome3.gnome_desktop gnome3.libzapojit json_glib
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  enableParallelBuilding = true;
-
-  preFixup =
-    let
-      libPath = stdenv.lib.makeLibraryPath
-        [ evince gtk3 gnome3.tracker gnome3.gnome_online_accounts ];
-    in
-    ''
-    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
-
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-        --prefix LD_LIBRARY_PATH ":" "${libPath}" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        --run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Documents;
-    description = "Document manager application designed to work with GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
@ -1,44 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, python3, libxml2, python3Packages, libnotify
-, pkgconfig, gtk3, glib, hicolor_icon_theme, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-music-3.12.2.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz";
-    sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo
-                  gnome3.grilo libxml2 python3Packages.pygobject3 libnotify
-                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-music" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Music;
-    description = "Music player and management application for the GNOME desktop environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop_file_utils, gmp
-, gnome3, librsvg, gdk_pixbuf, libexif }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-photos-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-photos/3.12/${name}.tar.xz";
-    sha256 = "077cc6c2ae28680457fba435a22184e25f3a60a6fbe1901a75e42f6f6136538f";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg exempi
-                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
-                  gnome3.gnome_online_accounts gnome3.gnome_desktop
-                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    substituteInPlace $out/bin/gnome-photos --replace gapplication "${glib}/bin/gapplication"
-
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Photos;
-    description = "Photos is an application to access, organize and share your photos with GNOME 3";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/nautilus-sendto/default.nix
@ -1,22 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-sendto-${version}";
-
-  version = "3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
-    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
-  };
-
-  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix
@ -1,35 +0,0 @@
-{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib
-, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup
-, gdk_pixbuf, librsvg }:
-
-stdenv.mkDerivation rec {
-  name = "polari-3.12.2";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz";
-    sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995";
-  };
-
-  buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3
-                  telepathy_glib gnome3.gjs telepathy_logger libsoup
-                  gdk_pixbuf librsvg
-                  gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  propagatedUserEnvPkgs = [ telepathy_idle ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/polari" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" 
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "Internet Relay Chat (IRC) client designed for GNOME 3";
-    homepage = https://wiki.gnome.org/Apps/Polari;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/pomodoro/default.nix
@ -1,49 +0,0 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra, gst_all_1, upower, vala, gnome3_12, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, hicolor_icon_theme
-}:
-
-stdenv.mkDerivation rec {
-  rev = "0.10.3";
-  name = "gnome-shell-pomodoro-${rev}-61df3fa";
-
-  src = fetchFromGitHub {
-      owner = "codito";
-      repo = "gnome-shell-pomodoro";
-      rev = "${rev}";
-      sha256 = "0i0glmijalppb5hdb1xd6xnmv824l2w831rpkqmhxi0iqbvaship";
-  };
-
-  configureScript = ''./autogen.sh'';
-
-  buildInputs = [
-    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra upower vala gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3_12.gsettings_desktop_schemas gnome3_12.gnome_desktop
-    gnome3_12.gnome_common gnome3_12.gnome_shell hicolor_icon_theme gtk3
-  ];
-
-  preBuild = ''
-    sed -i \
-        -e 's|/usr\(/share/gir-1.0/UPowerGlib\)|${upower}\1|' \
-        -e 's|/usr\(/share/gir-1.0/GnomeDesktop\)|${gnome3_12.gnome_desktop}\1|' \
-        vapi/Makefile
-  '';
-
-  preFixup = ''
-    wrapProgram $out/bin/gnome-pomodoro \
-        --prefix XDG_DATA_DIRS : \
-        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/codito/gnome-shell-pomodoro;
-    description =
-      "Personal information management application that provides integrated " + 
-      "mail, calendaring and address book functionality";
-    maintainers = with maintainers; [ DamienCassou ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, makeWrapper, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
-, libsecret, avahi, p11_kit }:
-
-stdenv.mkDerivation rec {
-  name = "seahorse-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/seahorse/3.12/${name}.tar.xz";
-    sha256 = "5e6fb25373fd4490e181e2fa0f5cacf99b78b2f6caa5d91c9c605900fb5f3839";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
-                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala gnome3.gcr
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/seahorse" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Seahorse;
-    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "baobab-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/baobab/3.12/${name}.tar.xz";
-    sha256 = "494808d8a5b1776377749a1dcd5b251eb399208a4c90380dc8b8c789811e514c";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Baobab;
-    description = "Graphical application to analyse disk usage in any Gnome environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/caribou/default.nix
@ -1,27 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core }:
-
-
-stdenv.mkDerivation rec {
-  name = "caribou-0.4.13";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/caribou/0.4/${name}.tar.xz";
-    sha256 = "953ba618621fda8a828d0d797fc916dbe35990dc01d7aa99d15e5e2241ee2782";
-  };
-
-  buildInputs = with gnome3;
-    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python pythonPackages.pygobject3
-      libxml2 libXtst gtk2 intltool libxslt ];
-
-  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
-
-  preBuild = ''
-    patchShebangs .
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/dconf/default.nix
@ -1,28 +0,0 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "dconf-${version}";
-  version = "0.20.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/dconf/0.20/${name}.tar.xz";
-    sha256 = "22c046a247d05ea65ad181e3aef4009c898a5531f76c0181f8ec0dfef83447d9";
-  };
-
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/dconf-editor" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-
-    rm $out/lib/gio/modules/giomodule.cache
-    rm $out/share/icons/hicolor/icon-theme.cache
-    rm $out/share/icons/HighContrast/icon-theme.cache
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
@ -1,54 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf
-, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
-, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
-, gcr, libsecret, folks, pulseaudio, telepathy_mission_control
-, telepathy_logger, libnotify, clutter, libsoup, gnutls
-, evolution_data_server
-, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
-
-# TODO: enable more features
-
-stdenv.mkDerivation rec {
-  name = "empathy-3.12.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz";
-    sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
-                            gnome_online_accounts shared_mime_info ];
-  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
-                            telepathy_mission_control ];
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
-                  libxml2 libxslt icu file makeWrapper
-                  telepathy_glib clutter_gtk clutter-gst cogl
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gcr libsecret pulseaudio gnome3.yelp_xsl gdk_pixbuf
-                  libnotify clutter libsoup gnutls libgee p11_kit
-                  libcanberra_gtk3 telepathy_farstream farstream
-                  gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas file libtool librsvg ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
-                         "-I${dbus_libs}/include/dbus-1.0"
-                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Empathy;
-    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
-    maintainers = with maintainers; [ lethalman ];
-    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/eog/default.nix
@ -1,29 +0,0 @@
-{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
-, shared_mime_info, makeWrapper, librsvg, libexif }:
-
-
-stdenv.mkDerivation rec {
-  name = "eog-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/eog/3.12/${name}.tar.xz";
-    sha256 = "0ca8be7f20c98e9b104b2c1fa53df293e5403e6d517de845ae0f3b72777453fd";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
-      gsettings_desktop_schemas shared_mime_info gnome_icon_theme gnome_desktop libexif ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/eog" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
-    platforms = platforms.linux;
-    description = "GNOME image viewer";
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/default.nix
@ -1,53 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
-, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
-, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, hicolor_icon_theme, gdk_pixbuf, librsvg, gnome_common }:
-
-stdenv.mkDerivation rec {
-  name = "epiphany-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/3.12/${name}.tar.xz";
-    sha256 = "16d9f8f10443328b2f226c2da545e75c8433f50f103af8aeb692b098d5fbbf93";
-  };
-
-  # Tests need an X display
-  configureFlags = [ "--disable-static --disable-tests" ];
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  nativeBuildInputs = [ pkgconfig file ];
-
-  configureScript = "./autogen.sh";
-
-  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
-                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
-                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg which gnome_common
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  patches = [ ./libxml_missing_dep.patch ];
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Epiphany;
-    description = "WebKit based web browser for GNOME";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/epiphany/libxml_missing_dep.patch
@ -1,10 +0,0 @@
--- configure.ac.orig	2014-05-19 13:28:28.493988695 +0200
-+++ configure.ac	2014-05-19 13:28:54.837159748 +0200
-@@ -115,6 +115,7 @@
- 
- PKG_CHECK_MODULES(WEB_EXTENSION, [
-                   $WEBKIT_GTK_PC_NAME >= $WEBKIT_GTK_REQUIRED
-+		  libxml-2.0 >= $LIBXML_REQUIRED
-                   libsecret-1 >= $LIBSECRET_REQUIRED
-                   ])
- AC_SUBST(WEB_EXTENSION_CFLAGS)
--- a/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evince/default.nix
@ -1,68 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
-, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
-, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
-, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
-, gobjectIntrospection
-}:
-
-stdenv.mkDerivation rec {
-  name = "evince-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evince/3.12/${name}.tar.xz";
-    sha256 = "30c243bbfde56338c25a39003b4848143be42157177e2163a368f14139909f7d";
-  };
-
-  buildInputs = [
-    pkgconfig intltool perl perlXMLParser libxml2
-    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
-    itstool gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
-    poppler ghostscriptX djvulibre libspectre
-    makeWrapper libsecret librsvg
-  ];
-
-  configureFlags = [
-    "--disable-nautilus" # Do not use nautilus
-    "--enable-introspection"
-  ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  preConfigure = with stdenv.lib;
-    optionalString doCheck ''
-      for file in test/*.py; do
-        echo "patching $file"
-        sed '1s,/usr,${python},' -i "$file"
-      done
-    '' + optionalString (recentListSize != null) ''
-      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
-      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
-    '';
-
-  preFixup = ''
-    # Tell Glib/GIO about the MIME info directory, which is used
-    # by `g_file_info_get_content_type ()'.
-    wrapProgram "$out/bin/evince" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  doCheck = false; # would need pythonPackages.dogTail, which is missing
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/projects/evince/;
-    description = "GNOME's document viewer";
-
-    longDescription = ''
-      Evince is a document viewer for multiple document formats.  It
-      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
-      of Evince is to replace the multiple document viewers that exist
-      on the GNOME Desktop with a single simple application.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/evolution-data-server/default.nix
@ -1,34 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python, sqlite
-, intltool, libsoup, libxml2, libsecret, icu
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
-
-
-stdenv.mkDerivation rec {
-  name = "evolution-data-server-3.12.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/3.12/${name}.tar.xz";
-    sha256 = "d3a2f832f823cb2a41467926dcaec984a15b2cb51ef89cf41267e337ca750811";
-  };
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
-      gcr p11_kit db nspr nss libgweather libical libgdata gperf makeWrapper icu sqlite ]
-    ++ stdenv.lib.optional valaSupport vala;
-
-  # uoa irrelevant for now
-  configureFlags = ["--disable-uoa" "--with-nspr-includes=${nspr}/include/nspr" "--with-nss-includes=${nss}/include/nss"]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix
@ -1,40 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
-, telepathy_glib, evolution_data_server, libsecret, db }:
-
-# TODO: enable more folks backends
-
-stdenv.mkDerivation rec {
-  name = "folks-0.9.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz";
-    sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj";
-  };
-
-  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
-  # dbus_daemon needed for tests
-  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
-                  vala libsecret libxml2 libsoup nspr nss intltool db ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = "--disable-fatal-warnings";
-
-  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
-
-  enableParallelBuilding = true;
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Folks";
-
-    homepage = https://wiki.gnome.org/Projects/Folks;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = with stdenv.lib.maintainers; [ lethalman ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gconf/default.nix
@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
-, intltool, polkit, orbit, withGtk ? false }:
-
-assert withGtk -> (gnome3 != null);
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.2";
-  versionMinor = "6";
-  moduleName   = "GConf";
-
-  origName = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  name = "gconf-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
-    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
-  };
-
-  buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
-  propagatedBuildInputs = [ glib dbus_glib  ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  # ToDo: ldap reported as not found but afterwards reported as supported
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gconf/;
-    description = "A system for storing application preferences";
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gcr/default.nix
@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
-, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala }:
-
-stdenv.mkDerivation rec {
-  name = "gcr-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gcr/3.12/${name}.tar.xz";
-    sha256 = "456e20615ab178aa92eeabdea64dcce535c10d5af189171d9375291a2447d21c";
-  };
-
-  buildInputs = [
-    pkgconfig intltool gnupg p11_kit glib gobjectIntrospection libxslt
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
-  ];
-
-  #doCheck = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gcr-viewer" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/default.nix
@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/3.12/${name}.tar.xz";
-    sha256 = "cc91fff5afd2a7c3e712c960a0b60744774167dcfc16f486372e1eb3c0aa1cc4";
-  };
-
-  # Only needed to make it build
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
-  '';
-
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  preBuild = ''
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
-  '';
-
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./propagate_env.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/propagate_env.patch
@ -1,13 +0,0 @@
--- a/daemon/gdm-launch-environment.c	2014-11-24 15:43:55.532879804 +0100
-+++ a/daemon/gdm-launch-environment.c	2014-11-28 18:22:42.636313967 +0100
-@@ -220,8 +220,8 @@ 
-                 "LANG", "LANGUAGE", "LC_CTYPE", "LC_NUMERIC", "LC_TIME",
-                 "LC_COLLATE", "LC_MONETARY", "LC_MESSAGES", "LC_PAPER",
-                 "LC_NAME", "LC_ADDRESS", "LC_TELEPHONE", "LC_MEASUREMENT",
-                "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH",
-                NULL
-+                "LC_IDENTIFICATION", "LC_ALL", "WINDOWPATH", "XCURSOR_PATH",
-+                "XDG_CONFIG_DIRS", NULL
-         };
-         char *system_data_dirs;
-         int i;
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/sessions_dir.patch
@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
--- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
--- a/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gdm/xserver_path.patch
@ -1,15 +0,0 @@
--- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
-        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
--- a/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/geocode-glib/default.nix
@ -1,20 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
-
-
-stdenv.mkDerivation rec {
-  name = "geocode-glib-3.12.2";
-
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/3.12/${name}.tar.xz";
-    sha256 = "5ca581a927cac3025adc2afadfdaf9a493ca887537a548aa47296bc77bcfa49e";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig glib libsoup json_glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gjs/default.nix
@ -1,21 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gobjectIntrospection, spidermonkey_24, pango }:
-
-
-stdenv.mkDerivation rec {
-  name = "gjs-1.40.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/1.40/${name}.tar.xz";
-    sha256 = "2f0d80ec96c6284785143abe51377d8a284977ea6c3cf0cef1020d92eae41793";
-  };
-
-  buildInputs = with gnome3;
-    [ gobjectIntrospection pkgconfig glib pango ];
-
-  propagatedBuildInputs = [ spidermonkey_24 ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-backgrounds/default.nix
@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/3.12/${name}.tar.xz";
-    sha256 = "ac4d3e0fffc5991865ca748e728a1ab87f167400105250ce2195b03502427180";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-bluetooth/default.nix
@ -1,22 +0,0 @@
-{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
-, udev, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-bluetooth-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0rsw27yj6887axk7s2vwpsr0pmic0wdskl7sx8rk4kns7b0ifs88";
-  };
-
-  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2
-                               gsettings_desktop_schemas itstool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
-    description = "Application that let you manage Bluetooth in the GNOME destkop";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix
@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-calculator-3.12.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz";
-    sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxml2 gnome3.gtksourceview
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-calculator" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
-    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-common/default.nix
@ -1,17 +0,0 @@
-{ stdenv, fetchurl, which, autoconf, automake }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-common-3.12.0";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gnome-common/3.12/${name}.tar.xz";
-    sha256 = "18712bc2df6b2dd88a11b9f7f874096d1c0c6e7ebc9cfc0686ef963bd590e1d8";
-  };
-
-  patches = [(fetchurl {
-    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
-    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
-  })];
-
-  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/configure_dbus_glib.patch
@ -1,10 +0,0 @@
--- configure.ac.orig	2014-04-08 10:25:49.497620879 +0200
-+++ configure.ac	2014-04-08 10:26:36.639440950 +0200
-@@ -43,6 +43,7 @@
- 	     folks-telepathy
- 	     folks-eds
- 	     libnotify
-+	     dbus-glib-1
- 	     telepathy-glib >= 0.17.5
- 	     libebook-1.2 >= 3.5.3
- 	     libedataserver-1.2 >= 3.5.3
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-contacts/default.nix
@ -1,51 +0,0 @@
-{ stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libsecret
-, bash, makeWrapper, itstool, folks, libnotify, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake114x, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-contacts-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/3.12/${name}.tar.xz";
-    sha256 = "fb3f25d409032b24fb67241e67d4da10cf6f77a48c088709455cea5f6f33e87d";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
-
-  # force build from vala
-  preBuild = ''
-   touch src/*.vala
-  '';
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
-                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
-                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
-                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  vala automake114x autoconf db ];
-
-  preFixup = ''
-    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  patches = [ ./configure_dbus_glib.patch ];
-
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Contacts;
-    description = "Contacts is GNOME's integrated address book";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- 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
@ -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;
-  };
-
-}
--- 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
@ -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,
--- 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
@ -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 "
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-desktop/default.nix
@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
-, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-
-  majorVersion = "3.12";
-  minorVersion = "2";
-  name = "gnome-desktop-${majorVersion}.${minorVersion}";
-
-  # this should probably be setuphook for glib
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
-    sha256 = "b7d691363ccc90182caff1980efa7d99e4569bea968d39654102a0c4e824a44d";
-  };
-
-  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11 xkeyboard_config isocodes itstool wayland
-                  gtk3 glib intltool gnome_doc_utils libxkbfile gnome3.gsettings_desktop_schemas gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-dictionary/default.nix
@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-dictionary-3.10.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/3.10/${name}.tar.xz";
-    sha256 = "258b60fe50f7d0580a7dc3bb83f7fe2f6f0597d4013d97ac083c3f062c350ed7";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-dictionary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Dictionary;
-    description = "Dictionary is the GNOME application to look up definitions";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
@ -1,41 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper, cracklib, libnotify
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
-, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-disk-utility-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/3.12/${name}.tar.xz";
-    sha256 = "5994bfae57063d74be45736050cf166cda5b1600a599703240b641b39375718e";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxslt libtool libsecret libpwquality cracklib
-                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
-                  gdk_pixbuf gnome3.gnome_icon_theme
-                  librsvg udisks2 gnome3.gnome_settings_daemon
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-disks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
-    description = "A udisks graphical front-end";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-font-viewer/default.nix
@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-font-viewer-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/3.12/${name}.tar.xz";
-    sha256 = "fca50711b7bd4edd1213dd4f05a309911cd1e832974142944c06d52ae07cbe45";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-font-viewer" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Program that can preview fonts and create thumbnails for fonts";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, iconnamingutils, gtk }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-icon-theme-symbolic-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-icon-theme-symbolic/3.12/${name}.tar.xz";
-    sha256 = "851a4c9d8e8cb0000c9e5e78259ab8b8e67c5334e4250ebcc8dfdaa33520068b";
-  };
-
-  configureFlags = "--enable-icon-mapping";
-
-  # Avoid postinstall make hooks
-  installPhase = ''
-    make install-exec-am install-data-local install-pkgconfigDATA
-    make -C src install
-  '';
-
-  buildInputs = [ pkgconfig iconnamingutils gtk ];
-
-  propagatedBuildInputs = [ gnome3.gnome_icon_theme ];
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_icon_theme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-icon-theme-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-icon-theme/3.12/${name}.tar.xz";
-    sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
-
-  propagatedBuildInputs = [ hicolor_icon_theme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-keyring/default.nix
@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-keyring-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/3.12/${name}.tar.xz";
-    sha256 = "3bc39a42d445b82d24247a8c39eeb0eef7ecb1c8ebb8e6ec62671868be93fd4c";
-  };
-
-  buildInputs = with gnome3; [
-    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
-    pango gcr gdk_pixbuf atk p11_kit makeWrapper
-  ];
-
-  propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
-  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
-
-  configureFlags = [
-    "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt" # NixOS hardcoded path
-    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
-    "--with-pkcs11-modules=$$out/lib/pkcs11/"
-  ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-keyring" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    wrapProgram "$out/bin/gnome-keyring-daemon" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-menus/default.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-menus-${version}";
-  version = "3.10.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
-    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  preBuild = "patchShebangs ./scripts";
-
-  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
-
-  meta = {
-    homepage = "http://www.gnome.org";
-    description = "Gnome menu specification";
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-accounts/default.nix
@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, webkitgtk, json_glib, rest, libsecret, dbus_glib
-, telepathy_glib, intltool, dbus_libs, icu, libsoup, docbook_xsl_ns, docbook_xsl
-}:
-
-stdenv.mkDerivation rec {
-  name = "gnome-online-accounts-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/3.12/${name}.tar.xz";
-    sha256 = "cac7758e09d32eb54af50ab6b23d65da0c8d48c555c8db011a0cf5b977d542ec";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest libsecret dbus_glib telepathy_glib intltool icu libsoup docbook_xsl_ns docbook_xsl];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-online-miners/default.nix
@ -1,35 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json_glib, gmp, openssl, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-online-miners-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/3.12/${name}.tar.xz";
-    sha256 = "734db67bb158a046bc8bbbe418f0fdaf6d8652ac86406907a8d17d069fa48f23";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
-                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
-                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
-                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/libexec/*; do
-      wrapProgram "$f" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
-    description = "A set of crawlers that go through your online content and index them locally in Tracker";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-screenshot/default.nix
@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-screenshot-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-screenshot/3.12/${name}.tar.xz";
-    sha256 = "ae4bf706652ae9b28c7930d22c2c37469a78d7f6656d312960b3c75ee5c36eb1";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-screenshot" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
-    description = "Utility used in the GNOME desktop environment for taking screenshots";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-session/default.nix
@ -1,30 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
-
-
-stdenv.mkDerivation rec {
-  name = "gnome-session-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/3.12/${name}.tar.xz";
-    sha256 = "fa308771ac18bc5f77e5a5be3b2d93df1625168cb40167c1dfa898e9006e25d3";
-  };
-
-  configureFlags = "--enable-systemd";
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-session" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-settings-daemon/default.nix
@ -1,35 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, pulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-settings-daemon-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/3.12/${name}.tar.xz";
-    sha256 = "e887bd63c733febccb7f2c1453c075016342e223214fa9cfc60d90f1e16e080f";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas
-      libnotify gnome_desktop lcms2 libXtst libxkbfile pulseaudio
-      libcanberra_gtk3 upower colord libgweather xkeyboard_config
-      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
-      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PATH : "${glib}/bin" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell-extensions/default.nix
@ -1,26 +0,0 @@
-{ stdenv, intltool, fetchurl, libgtop
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool
-, gnome3, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/3.12/${name}.tar.xz";
-    sha256 = "30ba6e4792062e5a5cdd18e4a12230e68bfed1ded7de433ad241dd75e7ae2fc6";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
-                  makeWrapper file ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
-    description = "Modify and extend GNOME Shell functionality and behavior";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-shell/default.nix
@ -1,55 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
-, python, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
-, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, hicolor_icon_theme, sqlite
-, pulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
-
-stdenv.mkDerivation rec {
-  name = "gnome-shell-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell/3.12/${name}.tar.xz";
-    sha256 = "3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71";
-  };
-
-  buildInputs = with gnome3;
-    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig python libsoup polkit libcanberra gdk_pixbuf librsvg
-      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
-      libXtst p11_kit networkmanagerapplet gjs mutter pulseaudio caribou evolution_data_server
-      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm gnome_control_center
-      hicolor_icon_theme gnome_icon_theme gnome_icon_theme_symbolic sqlite
-      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
-  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
-
-  preBuild = ''
-    patchShebangs src/data-to-c.pl
-    substituteInPlace data/Makefile --replace " install-keysDATA" ""
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram "$out/bin/gnome-shell" \
-      --prefix PATH : "${unzip}/bin" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
-      --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
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-log-3.9.90";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
-    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                            hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-log" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
-    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-system-monitor/default.nix
@ -1,39 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, hicolor_icon_theme, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-monitor-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/3.12/${name}.tar.xz";
-    sha256 = "ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [  ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
-                  gtkmm3 libgtop makeWrapper
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-monitor" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
-    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-terminal/default.nix
@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, libuuid
-, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.12";
-  versionMinor = "2";
-
-  name = "gnome-terminal-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
-    sha256 = "ea19ce610af2873d26e1e75491415e17af6a5080366db966f9220fdeea5ebecd";
-  };
-
-  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf itstool makeWrapper gnome3.nautilus ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
-
-  # FIXME: enable for gnome3
-  configureFlags = [ "--disable-search-provider" "--disable-migration" ];
-
-  preFixup = ''
-    for f in "$out/libexec/gnome-terminal-server"; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-themes-standard/default.nix
@ -1,15 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-themes-standard-3.12.0";
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-themes-standard/3.12/${name}.tar.xz";
-    sha256 = "a05d1b7ca872b944a69d0c0cc2369408ece32ff4355e37f8594a1b70d13c3217";
-  };
-  
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix
@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-user-docs-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz";
-    sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd";
-  };
-
-  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-help/3.12;
-    description = "User and system administration help for the Gnome desktop";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.cc-by-30;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
@ -1,51 +0,0 @@
-{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, hicolor_icon_theme, libxml2, gnused
-, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
-, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-user-share-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-share/3.10/${name}.tar.xz";
-    sha256 = "1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  preConfigure = ''
-    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
-  '';
-
-  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd_2_2}/modules"
-                     "--disable-bluetooth"
-                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  nautilus libnotify libcanberra_gtk3 ];
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/$name
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
-    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-user-share" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
-    description = "Service that exports the contents of the Public folder in your home directory on the local network";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix
@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
-, gmime, json_glib, avahi, tracker, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-plugins-0.2.13";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
-    sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
-  };
-
-  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
-
-  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
-                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
-                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
-                  avahi gnome3.libmediaart tracker intltool itstool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "A collection of plugins for the Grilo framework";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix
@ -1,31 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-0.2.11";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
-    sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6";
-  };
-
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
-
-  preConfigure = ''
-    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
-       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
-    done
-  '';
-
-  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gsettings-desktop-schemas/default.nix
@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
-  # just for passthru
-, gtk3, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.12";
-  versionMinor = "2";
-  moduleName   = "gsettings-desktop-schemas";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "da75021e9c45a60d0a97ea3486f93444275d0ace86dbd1b97e5d09000d8c4ad1";
-  };
-
-  buildInputs = [ glib gobjectIntrospection ];
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix
@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2Python, perl, intltool, gettext }:
-
-stdenv.mkDerivation rec {
-  name = "gtksourceview-${version}";
-  version = "3.12.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz";
-    sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk";
-  };
-
-  propagatedBuildInputs = [ gtk3 ];
-
-  buildInputs = [ pkgconfig atk cairo glib pango
-                  libxml2Python perl intltool gettext ];
-
-  preBuild = ''
-    substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
-  ''; 
-
-  patches = [ ./nix_share_path.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.lethalman ];
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/nix_share_path.patch
@ -1,11 +0,0 @@
--- a/gtksourceview/gtksourceview-utils.c	2014-07-13 16:13:57.418687726 +0200
-+++ b/gtksourceview/gtksourceview-utils.c	2014-07-13 16:14:20.550847767 +0200
-@@ -68,6 +68,8 @@
- 							 basename,
- 							 NULL));
- 
-+        g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
-+
- 	g_ptr_array_add (dirs, NULL);
- 
- 	return (gchar**) g_ptr_array_free (dirs, FALSE);
--- a/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/gucharmap/default.nix
@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
-, glib, desktop_file_utils, bash
-, makeWrapper, gnome3, file, itstool, libxml2 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.gnome_icon_theme_symbolic 
-
-stdenv.mkDerivation rec {
-  name = "gucharmap-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gucharmap/3.12/${name}.tar.xz";
-    sha256 = "5e260767da43f6dc31a8be33ca363da56781349b367464fa9c478bca66aa18d9";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 intltool itstool glib
-                  gnome3.yelp_tools libxml2 file desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gucharmap" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gucharmap;
-    description = "GNOME Character Map, based on the Unicode Character Database";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libcroco/default.nix
@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
-
-stdenv.mkDerivation rec {
-  name = "libcroco-0.6.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
-  };
-
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
-
-  buildInputs = [ pkgconfig libxml2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.unix;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgdata/default.nix
@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib
-, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "libgdata-0.14.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgdata/0.14/${name}.tar.xz";
-    sha256 = "1scjs944kjazbsh86kdj6w2vprib6yd3wzxzabcs59acmr0m4hax";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
-
-  buildInputs = with gnome3;
-    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection
-      liboauth gcr gnome_online_accounts p11_kit openssl ];
-      
-  meta = with stdenv.lib; {
-    description = "GData API library";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgee/default.nix
@ -1,25 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }:
-let
-  ver_maj = "0.14";
-  ver_min = "0";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "08e466d3f214c9466860b5a82629de0de9eb89b1de7bd918fe154e569b5834cd";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/libgee/fix_introspection_paths.patch
@ -1,13 +0,0 @@
--- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
-+++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
-@@ -12085,8 +12085,8 @@
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-+       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
--- a/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgnome-keyring/default.nix
@ -1,26 +0,0 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "libgnome-keyring-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
-    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
-  };
-
-  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = {
-    description = "Framework for managing passwords and other secrets";
-    homepage = http://live.gnome.org/GnomeKeyring;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
-    inherit (glib.meta) platforms maintainers;
-
-    longDescription = ''
-      gnome-keyring is a program that keeps password and other secrets for
-      users. The library libgnome-keyring is used by applications to integrate
-      with the gnome-keyring system.
-    '';
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgnomekbd/default.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "libgnomekbd-3.6.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
-    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
-  };
-
-  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
-
-  preFixup = ''
-    wrapProgram $out/bin/gkbd-keyboard-display \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Keyboard management library";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgweather/default.nix
@ -1,21 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata }:
-
-stdenv.mkDerivation rec {
-  name = "libgweather-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgweather/3.12/${name}.tar.xz";
-    sha256 = "54ef096350d7774ab1b3f23ed768246301cdcedfaa762a2c46920bf87fcc1c37";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
-  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libgxps/default.nix
@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr
-}:
-
-stdenv.mkDerivation rec {
-  name = "libgxps-0.2.2";
-
-  src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
-  };
-
-  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
-
-  configureFlags = "--without-liblcms2";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libpeas/default.nix
@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool
-, glib, gtk3, gobjectIntrospection, python, pygobject3
-}:
-
-stdenv.mkDerivation rec {
-  name = "libpeas-${version}";
-  version = "1.10.0";
-
-  buildInputs =  [
-   intltool pkgconfig
-   glib gtk3 gobjectIntrospection python pygobject3
-  ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/1.10/${name}.tar.xz";
-    sha256 = "4695bc40e4885a903dbc5ce6a3704392feae63af51fd4da7a3888bb88ca78c47";
-  };
-
-  preFixup = ''
-    rm $out/share/icons/hicolor/icon-theme.cache
-  '';
-
-  meta = {
-    description = "A GObject-based plugins engine";
-    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/libzapojit/default.nix
@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
-
-stdenv.mkDerivation rec {
-  name = "libzapojit-0.0.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
-    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
-  };
-
-  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/mutter/default.nix
@ -1,33 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
-, libtool, makeWrapper }:
-
-
-stdenv.mkDerivation rec {
-  name = "mutter-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/mutter/3.12/${name}.tar.xz";
-    sha256 = "e653cf3e8c29af8d8c086bebcaa06781c48695be949417b72278fee37fe9e173";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
-      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
-      libcanberra_gtk3 zenity libtool makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/mutter" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/default.nix
@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
-, gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, makeWrapper, exempi, librsvg, tracker }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus/3.12/${name}.tar.xz";
-    sha256 = "969c2bedc324eab7b9399bdb3a7db61f819a2995c733349ded081b059a1cafb1";
-  };
-
-  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
-                  gnome3.gnome_desktop gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/nautilus" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  patches = [ ./extension_dir.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/nautilus/extension_dir.patch
@ -1,24 +0,0 @@
-diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
-index 6273a76..4adcc8a 100644
--- a/libnautilus-private/nautilus-module.c
-+++ b/libnautilus-private/nautilus-module.c
-@@ -242,11 +242,17 @@ void
- nautilus_module_setup (void)
- {
- 	static gboolean initialized = FALSE;
-+	const gchar* extensiondir = NULL;
- 
- 	if (!initialized) {
- 		initialized = TRUE;
-		
-		load_module_dir (NAUTILUS_EXTENSIONDIR);
-+	
-+		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
-+		if (extensiondir == NULL) {
-+			extensiondir = NAUTILUS_EXTENSIONDIR;
-+		}
-+	
-+		load_module_dir (extensiondir);
- 
- 		eel_debug_call_at_shutdown (free_module_objects);
- 	}
--- a/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/rest/default.nix
@ -1,18 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "rest-0.7.91";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-    sha256 = "838814d935143f2dc99eb79f1ac69c615e7b547339f6cd226dd0ed4d7c16b67a";
-  };
-
-  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
-
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/sushi/default.nix
@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
-, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
-, gdk_pixbuf, librsvg, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "sushi-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
-    sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
-  };
-
-  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib
-                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf librsvg
-                  gnome3.gnome_icon_theme hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  libmusicbrainz5 webkitgtk gnome3.evince icu makeWrapper ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram $out/libexec/sushi-start \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
-    description = "A quick previewer for Nautilus";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/totem-pl-parser/default.nix
@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "totem-pl-parser-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
-    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
-  };
-
-  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Simple GObject-based library to parse and save a host of playlist formats";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix
@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, gst_all_1
-, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib, hicolor_icon_theme
-, bash, makeWrapper, itstool, libxml2, dbus_glib
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "totem-3.12.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz";
-    sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn";
-  };
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
-                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/totem" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Movie player for the GNOME desktop based on GStreamer";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix
@ -1,55 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection
-, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf
-, gnome3, librsvg, gdk_pixbuf, file, libnotify
-, evolution_data_server, gst_all_1, poppler, libtool
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
-
-stdenv.mkDerivation rec {
-  name = "tracker-1.0.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz";
-    sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preConfigure = ''
-    substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/"
-    sed -i -e 's,glib/poppler.h,poppler.h,' src/tracker-extract/tracker-extract-pdf.c
-  '';
-  
-  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
-                  bzip2 gnome3.totem-pl-parser gobjectIntrospection
-                  automake114x autoconf libtool
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite
-                  upower libnotify evolution_data_server gnome3.libgee
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
-                  poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/Tracker;
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vino/default.nix
@ -1,33 +0,0 @@
-{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, hicolor_icon_theme, gnome3
-, libnotify, file, telepathy_glib, dbus_glib }:
-
-stdenv.mkDerivation rec {
-  name = "vino-${versionMajor}.${versionMinor}";
-  versionMajor = "3.12";
-  versionMinor = "0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
-    sha256 = "86c9d8b60d79982e4488815db0d441c398e011ad8262659789afecc97a01ca5b";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  hicolor_icon_theme gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic
-                  dbus_glib telepathy_glib file makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
-    description = "GNOME desktop sharing server";
-    maintainers = with maintainers; [ lethalman iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix
@ -1,43 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection
-, selectTextPatch ? false }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.36";
-  versionMinor = "3";
-  moduleName   = "vte";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
-  };
-
-  patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.patch;
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
+++ b/pkgs/desktops/gnome-3/3.12/core/vte/expose_select_text.patch
@ -1,227 +0,0 @@
-Only in vte-0.38.0.new: expose_select_text.patch
-diff -aur vte-0.38.0/src/vteaccess.c vte-0.38.0.new/src/vteaccess.c
--- vte-0.38.0/src/vteaccess.c	2014-08-13 08:00:38.000000000 -0400
-+++ vte-0.38.0.new/src/vteaccess.c	2014-09-21 17:05:23.934641193 -0400
-@@ -1427,7 +1427,7 @@
- 	*start_offset = offset_from_xy (priv, start_x, start_y);
- 	_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
- 	*end_offset = offset_from_xy (priv, end_x, end_y);
-	return _vte_terminal_get_selection (terminal);
-+	return vte_terminal_get_selection (terminal);
- }
- 
- static gboolean
-diff -aur vte-0.38.0/src/vte.c vte-0.38.0.new/src/vte.c
--- vte-0.38.0/src/vte.c	2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vte.c	2014-09-21 17:03:04.671656749 -0400
-@@ -122,7 +122,6 @@
- 						 gpointer data,
- 						 GArray *attributes,
- 						 gboolean include_trailing_spaces);
-static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
- static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
- static void vte_terminal_stop_processing (VteTerminal *terminal);
- 
-@@ -3267,9 +3266,10 @@
- 	_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
- 	terminal->pvt->pty_input_source = 0;
- }
-static void
-_vte_terminal_connect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_connect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_channel == NULL) {
- 		return;
- 	}
-@@ -3321,9 +3321,10 @@
- 	}
- }
- 
-static void
-_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_disconnect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_input_source != 0) {
- 		_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
- 		g_source_remove(terminal->pvt->pty_input_source);
-@@ -6154,6 +6155,28 @@
- 	}
- }
- 
-+/**
-+ * vte_terminal_set_cursor_position:
-+ * @terminal: a #VteTerminal
-+ * @column: the new cursor column
-+ * @row: the new cursor row
-+ *
-+ * Set the location of the cursor.
-+ */
-+void
-+vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				 long column, long row)
-+{
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	terminal->pvt->screen->cursor_current.col = column;
-+	terminal->pvt->screen->cursor_current.row = row;
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	_vte_check_cursor_blink(terminal);
-+	vte_terminal_queue_cursor_moved(terminal);
-+}
-+
- static GtkClipboard *
- vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
- {
-@@ -6319,7 +6342,7 @@
-         vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
- 
- 	/* Temporarily stop caring about input from the child. */
-	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- }
- 
- static gboolean
-@@ -6336,7 +6359,7 @@
- 		terminal->pvt->selecting = FALSE;
- 
- 		/* Reconnect to input from the child if we paused it. */
-		_vte_terminal_connect_pty_read(terminal);
-+		vte_terminal_connect_pty_read(terminal);
- 
- 		return TRUE;
- 	}
-@@ -6834,6 +6857,50 @@
- 	vte_terminal_deselect_all (terminal);
- }
- 
-+/**
-+ * vte_terminal_get_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ *
-+ * Checks whether or not block selection is enabled.
-+ *
-+ * Returns: %TRUE if block selection is enabled, %FALSE if not
-+ */
-+gboolean
-+vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
-+	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-+	return terminal->pvt->selection_block_mode;
-+}
-+
-+/**
-+ * vte_terminal_set_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ * @block_mode: whether block selection is enabled
-+ *
-+ * Sets whether or not block selection is enabled.
-+ */
-+void
-+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+	terminal->pvt->selection_block_mode = block_mode;
-+}
-+
-+/**
-+ * vte_terminal_select_text:
-+ * @terminal: a #VteTerminal
-+ * @start_col: the starting column for the selection
-+ * @start_row: the starting row for the selection
-+ * @end_col: the end column for the selection
-+ * @end_row: the end row for the selection
-+ *
-+ * Sets the current selection region.
-+ */
-+void
-+vte_terminal_select_text(VteTerminal *terminal,
-+			 long start_col, long start_row,
-+			 long end_col, long end_row) {
-+	_vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
-+}
-+
- /* Autoscroll a bit. */
- static gboolean
- vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8476,7 +8543,7 @@
- #endif
- 		kill(terminal->pvt->pty_pid, SIGHUP);
- 	}
-	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- 	_vte_terminal_disconnect_pty_write(terminal);
- 	if (terminal->pvt->pty_channel != NULL) {
- 		g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12533,7 +12600,7 @@
-         g_object_freeze_notify(object);
- 
-         if (pvt->pty != NULL) {
-                _vte_terminal_disconnect_pty_read(terminal);
-+                vte_terminal_disconnect_pty_read(terminal);
-                 _vte_terminal_disconnect_pty_write(terminal);
- 
-                 if (terminal->pvt->pty_channel != NULL) {
-@@ -12588,7 +12655,7 @@
-         _vte_terminal_setup_utf8 (terminal);
- 
-         /* Open channels to listen for input on. */
-        _vte_terminal_connect_pty_read (terminal);
-+        vte_terminal_connect_pty_read (terminal);
- 
-         g_object_notify(object, "pty");
- 
-@@ -12623,7 +12690,7 @@
- }
- 
- char *
-_vte_terminal_get_selection(VteTerminal *terminal)
-+vte_terminal_get_selection(VteTerminal *terminal)
- {
- 	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
- 
-Only in vte-0.38.0.new/src: .vte.c.swp
-diff -aur vte-0.38.0/src/vteint.h vte-0.38.0.new/src/vteint.h
--- vte-0.38.0/src/vteint.h	2014-05-16 13:51:26.000000000 -0400
-+++ vte-0.38.0.new/src/vteint.h	2014-09-21 17:05:44.934589281 -0400
-@@ -25,7 +25,6 @@
- G_BEGIN_DECLS
- 
- void _vte_terminal_accessible_ref(VteTerminal *terminal);
-char* _vte_terminal_get_selection(VteTerminal *terminal);
- void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff -aur vte-0.38.0/src/vteterminal.h vte-0.38.0.new/src/vteterminal.h
--- vte-0.38.0/src/vteterminal.h	2014-09-13 03:23:47.000000000 -0400
-+++ vte-0.38.0.new/src/vteterminal.h	2014-09-21 17:03:39.094903032 -0400
-@@ -170,6 +170,18 @@
- 
- void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
- void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
-+                                           gboolean block_mode) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_select_text(VteTerminal *terminal,
-+                              long start_col, long start_row,
-+                              long end_col, long end_row) _VTE_GNUC_NONNULL(1);
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+
-+/* pause and unpause output */
-+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
-+void vte_terminal_connect_pty_read(VteTerminal *vte);
- 
- /* Set the terminal's size. */
- void vte_terminal_set_size(VteTerminal *terminal,
-@@ -276,6 +288,8 @@
- void vte_terminal_get_cursor_position(VteTerminal *terminal,
- 				      glong *column,
-                                       glong *row) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				      long column, long row) _VTE_GNUC_NONNULL(1);
- 
- /* Add a matching expression, returning the tag the widget assigns to that
-  * expression. */
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp-tools/default.nix
@ -1,22 +0,0 @@
-{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-tools-3.12.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/3.12/${name}.tar.xz";
-    sha256 = "7a5370d7adbec3b6e6b7b5e7e5ed966cb99c797907a186b94b93c184e97f0172";
-  };
-
-  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
-    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
-    maintainers = with maintainers; [ iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp-xsl/default.nix
@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
-, itstool, libxml2, libxslt }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-xsl-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/3.12/${name}.tar.xz";
-    sha256 = "dd0b8af338b1cdae50444273d7c761e3f511224421487311103edc95a4493656";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "Yelp's universal stylesheets for Mallard and DocBook";
-    maintainers = with maintainers; [ lethalman ];
-    license = [licenses.gpl2 licenses.lgpl2];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/yelp/default.nix
@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, hicolor_icon_theme, gnome3, gdk_pixbuf, sqlite
-, bash, makeWrapper, itstool, libxml2, libxslt, icu }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp/3.12/${name}.tar.xz";
-    sha256 = "0k2a1fggidmh98x2fv8zki2lbx7wx7p4b25iq11p6q8j9fwr2ff8";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard  ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
-                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
-                  librsvg gdk_pixbuf gnome3.gnome_icon_theme
-                  hicolor_icon_theme gnome3.gnome_icon_theme_symbolic
-                  gnome3.gsettings_desktop_schemas sqlite ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/yelp" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/:${gnome3.gnome_themes_standard}/share:${gnome3.yelp_xsl}/share/yelp-xsl:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/yelp:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "The help viewer in Gnome";
-    maintainers = with maintainers; [ lethalman ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/core/zenity/default.nix
@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.12";
-  versionMinor = "1";
-
-  name = "zenity-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
-    sha256 = "a59705cdd1ea5318fdae3075c1cedcbead479230e9bead204391566d973dae11";
-  };
-
-  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/default.nix
@ -1,299 +0,0 @@
-{ callPackage, pkgs }:
-
-rec {
-  corePackages = with gnome3; [
-    pkgs.desktop_file_utils pkgs.ibus
-    pkgs.shared_mime_info # for update-mime-database
-    gtk3 # for gtk-update-icon-cache
-    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
-    gnome-menus gnome_settings_daemon gnome_shell
-    gnome_themes_standard defaultIconTheme
-  ];
-
-  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
-    gucharmap nautilus totem vino yelp gnome-bluetooth
-    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-shell-extensions gnome-system-log gnome-system-monitor
-    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
-    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto
-  ];
-
-  inherit (pkgs) glib gtk2 gtk3 gnome2;
-  gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; };
-
-  # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12
-  clutter = pkgs.clutter_1_18;
-  clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; };
-  clutter-gst = pkgs.clutter-gst.override { inherit clutter; };
-  cogl = pkgs.cogl_1_18;
-
-  gtk = gtk3; # just to be sure
-  libcanberra = pkgs.libcanberra_gtk3; # just to be sure
-  inherit (pkgs.gnome2) ORBit2;
-  orbit = ORBit2;
-  inherit (pkgs) libsoup;
-
-  version = "3.12";
-
-# Simplify the nixos module and gnome packages
-  defaultIconTheme = gnome_icon_theme_symbolic;
-
-#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
-
-  baobab = callPackage ./core/baobab { };
-
-  caribou = callPackage ./core/caribou { };
-
-  dconf = callPackage ./core/dconf { };
-
-  empathy = callPackage ./core/empathy {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  epiphany = callPackage ./core/epiphany {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
-
-  evolution_data_server = callPackage ./core/evolution-data-server { };
-
-  gconf = callPackage ./core/gconf { };
-
-  geocode_glib = callPackage ./core/geocode-glib { };
-
-  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
-
-  gdm = callPackage ./core/gdm { };
-
-  gjs = callPackage ./core/gjs { };
-
-  glib_networking = pkgs.glib_networking.override {
-    inherit gsettings_desktop_schemas;
-  };
-
-  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
-
-  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
-  gnome-contacts = callPackage ./core/gnome-contacts { };
-
-  gnome_control_center = callPackage ./core/gnome-control-center { };
-
-  gnome-calculator = callPackage ./core/gnome-calculator { };
-
-  gnome_common = callPackage ./core/gnome-common { };
-
-  gnome_desktop = callPackage ./core/gnome-desktop { };
-
-  gnome-dictionary = callPackage ./core/gnome-dictionary { };
-
-  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
-
-  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
-
-  gnome_icon_theme = callPackage ./core/gnome-icon-theme { };
-
-  gnome_icon_theme_symbolic = callPackage ./core/gnome-icon-theme-symbolic { };
-
-  gnome-menus = callPackage ./core/gnome-menus { };
-
-  gnome_keyring = callPackage ./core/gnome-keyring { };
-
-  libgnome_keyring = callPackage ./core/libgnome-keyring { };
-
-  libgnomekbd = callPackage ./core/libgnomekbd { };
-
-  folks = callPackage ./core/folks { };
-
-  gnome_online_accounts = callPackage ./core/gnome-online-accounts {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  gnome-online-miners = callPackage ./core/gnome-online-miners { };
-
-  gnome_session = callPackage ./core/gnome-session { };
-
-  gnome_shell = callPackage ./core/gnome-shell { };
-
-  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
-
-  gnome-screenshot = callPackage ./core/gnome-screenshot { };
-
-  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
-
-  gnome-system-log = callPackage ./core/gnome-system-log { };
-
-  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
-
-  gnome_terminal = callPackage ./core/gnome-terminal { };
-
-  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
-
-  gnome-user-docs = callPackage ./core/gnome-user-docs { };
-
-  gnome-user-share = callPackage ./core/gnome-user-share { };
-
-  grilo = callPackage ./core/grilo { };
-
-  grilo-plugins = callPackage ./core/grilo-plugins { };
-
-  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
-
-  gtksourceview = callPackage ./core/gtksourceview { };
-
-  gucharmap = callPackage ./core/gucharmap { };
-
-  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
-
-  eog = callPackage ./core/eog { };
-
-  libcroco = callPackage ./core/libcroco {};
-
-  libgee = callPackage ./core/libgee { };
-
-  libgdata = callPackage ./core/libgdata { };
-
-  libgxps = callPackage ./core/libgxps { };
-
-  libpeas = callPackage ./core/libpeas {};
-
-  libgweather = callPackage ./core/libgweather { };
-
-  libzapojit = callPackage ./core/libzapojit { };
-
-  mutter = callPackage ./core/mutter { };
-
-  nautilus = callPackage ./core/nautilus { };
-
-  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
-    inherit gnome3;
-  };
-
-  networkmanager_pptp = pkgs.networkmanager_pptp.override {
-    inherit gnome3;
-  };
-
-  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
-    inherit gnome3;
-  };
-
-  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
-    inherit gnome3;
-  };
-
-  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
-    inherit gnome3;
-  };
-
-  networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking;
-  };
-
-  rest = callPackage ./core/rest { };
-
-  sushi = callPackage ./core/sushi {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  totem = callPackage ./core/totem { };
-
-  totem-pl-parser = callPackage ./core/totem-pl-parser { };
-
-  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
-
-  vte = callPackage ./core/vte { };
-
-  vino = callPackage ./core/vino { };
-
-  yelp = callPackage ./core/yelp {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  yelp_xsl = callPackage ./core/yelp-xsl { };
-
-  yelp_tools = callPackage ./core/yelp-tools { };
-
-  zenity = callPackage ./core/zenity { };
-
-
-#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
-
-  bijiben = callPackage ./apps/bijiben {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  evolution = callPackage ./apps/evolution {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  file-roller = callPackage ./apps/file-roller { };
-
-  gedit = callPackage ./apps/gedit { };
-
-  glade = callPackage ./apps/glade { };
-
-  gnome-boxes = callPackage ./apps/gnome-boxes {
-    gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
-    spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
-  };
-
-  gnome-clocks = callPackage ./apps/gnome-clocks { };
-
-  gnome-documents = callPackage ./apps/gnome-documents {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  gnome-music = callPackage ./apps/gnome-music { };
-
-  gnome-photos = callPackage ./apps/gnome-photos { };
-
-  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
-  seahorse = callPackage ./apps/seahorse { };
-
-  polari = callPackage ./apps/polari { };
-
-  pomodoro = callPackage ./apps/pomodoro { };
-
-#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
-
-  anjuta = callPackage ./devtools/anjuta { };
-
-  gdl = callPackage ./devtools/gdl { };
-
-#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
-
-  geary = callPackage ./misc/geary {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  gfbgraph = callPackage ./misc/gfbgraph { };
-
-  goffice = callPackage ./misc/goffice { };
-
-  gitg = callPackage ./misc/gitg {
-    webkitgtk = pkgs.webkitgtk24x;
-  };
-
-  libgda = callPackage ./misc/libgda { };
-
-  libgit2-glib = callPackage ./misc/libgit2-glib {
-    libgit2 = pkgs.libgit2.override { libssh2 = null; };
-  };
-
-  libmediaart = callPackage ./misc/libmediaart { };
-
-  gexiv2 = callPackage ./misc/gexiv2 { };
-
-  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
-
-  gpaste = callPackage ./misc/gpaste { };
-
-  gtkhtml = callPackage ./misc/gtkhtml { };
-
-}
--- a/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/desktop/rarian/default.nix
@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
-
-stdenv.mkDerivation rec {
-  name = "rarian-0.8.1";
-  src = fetchurl {
-    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
-    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
-  };
-
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
-  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/devtools/anjuta/default.nix
@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
-  itstool, python }:
-
-let
-  major = "3.13";
-  minor = "1";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "anjuta-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
-    sha256 = "71bdad9a0e427d9481858eec40b9c1facef4b551d732023cc18a50019df4b78b";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python ];
-
-  meta = with stdenv.lib; {
-    description = "Software development studio";
-    homepage = http://anjuta.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix
+++ b/pkgs/desktops/gnome-3/3.12/devtools/gdl/default.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool }:
-
-let
-  major = "3.12";
-  minor = "0";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "gdl-${version}";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
-    sha256 = "4770f959f31ed5e616fe623c284e8dd6136e49902d19b6e37938d34be4f6b88d";
-  };
-
-  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
-
-  meta = with stdenv.lib; {
-    description = "Gnome docking library";
-    homepage = https://developer.gnome.org/gdl/;
-    license = [ licenses.gpl2 ];
-    platforms = platforms.linux;
-  };
-}
--- a/Show More
+++ b/Show More