diff options
Diffstat (limited to 'pkgs/desktops')
86 files changed, 190 insertions, 149 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix index 315f6ff9c5a9..dd7e269f94e5 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + # remove a tree of dirs with no files within + postInstall = '' rm -r "$out/share/locale" ''; + meta = { platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix index 3bce034507ac..5eb922994ee4 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Bijiben; description = "Note editor designed to remain simple to use"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix index b4240a35a68f..a77fe574709f 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix index d36162e13c2a..122449eb4f5f 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/FileRoller; description = "Archive manager for the GNOME desktop environment"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix index 172c817f6f92..9263fd424767 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Gedit; description = "Official text editor of the GNOME desktop environment"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix index 22b896c3337a..24d7688e4de0 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Glade; description = "User interface designer for GTK+ applications"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix index 8bdfcfd9f887..469581deef48 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, libgweather, libnotify , pkgconfig, gtk3, glib, hicolor_icon_theme, gsound , makeWrapper, itstool, libcanberra_gtk3, libtool -, gnome3, librsvg, gdk_pixbuf, geoclue2 }: +, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-clocks-${gnome3.version}.1"; @@ -13,27 +13,19 @@ stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; - buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3 gnome3.gsettings_desktop_schemas makeWrapper gdk_pixbuf gnome3.adwaita-icon-theme librsvg gnome3.gnome_desktop gnome3.geocode_glib geoclue2 libgweather libnotify libtool gsound - hicolor_icon_theme gnome3.adwaita-icon-theme ]; + hicolor_icon_theme wrapGAppsHook ]; 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix index 50fff0cd1d2e..98059d3ed131 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix @@ -2,8 +2,8 @@ , pkgconfig, gtk3, glib, hicolor_icon_theme , makeWrapper, itstool, libxslt, webkitgtk , gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl -, gobjectIntrospection, json_glib -, gmp, desktop_file_utils }: +, gobjectIntrospection, json_glib, inkscape, poppler_utils +, gmp, desktop_file_utils, wrapGAppsHook }: stdenv.mkDerivation rec { name = "gnome-documents-${gnome3.version}.0"; @@ -15,36 +15,29 @@ stdenv.mkDerivation rec { doCheck = true; - propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + configureFlags = [ "--enable-getting-started" ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt - docbook_xsl desktop_file_utils + docbook_xsl desktop_file_utils inkscape poppler_utils gnome3.gsettings_desktop_schemas makeWrapper gmp gdk_pixbuf gnome3.adwaita-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.adwaita-icon-theme ]; + wrapGAppsHook ]; enableParallelBuilding = true; - preFixup = - '' + preFixup = '' 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 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 + gappsWrapperArgs+=(--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') ''; 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix index 31ee8a7230c1..0193f00da4f5 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix @@ -1,5 +1,5 @@ { stdenv, intltool, fetchurl, gdk_pixbuf, tracker -, python3, libxml2, python3Packages, libnotify +, python3, libxml2, python3Packages, libnotify, wrapGAppsHook , pkgconfig, gtk3, glib, hicolor_icon_theme, cairo , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: @@ -15,29 +15,21 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart gdk_pixbuf gnome3.adwaita-icon-theme librsvg python3 - gnome3.grilo libxml2 python3Packages.pygobject3 libnotify + gnome3.grilo gnome3.grilo-plugins 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.adwaita-icon-theme + hicolor_icon_theme gnome3.adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas makeWrapper tracker ]; - enableParallelBuilding = true; + wrapPrefixVariables = [ "PYTHONPATH" ]; - 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" - ''; + enableParallelBuilding = true; 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix index fba1a541812c..83a732a01d50 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix @@ -1,7 +1,7 @@ { stdenv, intltool, fetchurl, exempi, libxml2 , pkgconfig, gtk3, glib, hicolor_icon_theme , makeWrapper, itstool, gegl, babl, lcms2 -, desktop_file_utils, gmp, libmediaart +, desktop_file_utils, gmp, libmediaart, wrapGAppsHook , gnome3, librsvg, gdk_pixbuf, libexif }: stdenv.mkDerivation rec { @@ -14,8 +14,6 @@ stdenv.mkDerivation rec { # 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.libgdata @@ -24,23 +22,14 @@ stdenv.mkDerivation rec { 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.adwaita-icon-theme ]; - - preFixup = '' - 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 - ''; + wrapGAppsHook ]; enableParallelBuilding = true; 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix index 5a85e00e4e45..093900dcb7ab 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Integrates Evolution and Pidgin into the Nautilus file manager"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix index 7d610c79b490..3e7b72373136 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix index b2cf8277641a..1debc3646bc8 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Vinagre; description = "Remote desktop viewer for GNOME"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix index a445ff73608b..6a594aa6a1ee 100644 --- a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix @@ -13,11 +13,14 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ hicolor_icon_theme ]; buildInputs = [ gdk_pixbuf librsvg ]; - + nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ]; + # remove a tree of dirs with no files within + postInstall = '' rm -r "$out/locale" ''; + meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix index 87c21e3eb010..eb93458ece58 100644 --- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix index b75b055fc3f3..c2cb6a661abe 100644 --- a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix index e69bcd390329..94be115e95ce 100644 --- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix index 3f71165e7133..990e2007a23f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix index ef344c5bf55c..10e52fe92657 100644 --- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; # TODO: license = [ licenses.gpl2 licenses.lgpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix index 093bab63fe44..fa1d41ef153e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/EyeOfGnome; platforms = platforms.linux; description = "GNOME image viewer"; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix index b03fbd4e9c14..72663122a542 100644 --- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix index 82397b385d59..2126aa9ee4db 100644 --- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix index 5f3954f14f35..6e200bdb3188 100644 --- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix index f9d87298fff4..a4a26bca1922 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix index 450914ce7459..83642f1afe6f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix index 17245bd9d2a9..d4ef3e13eea9 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix index 8c546394bd21..97c5ce2a71ff 100644 --- a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix index d48e23417221..12b4561e6315 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix index 5b7d7c19d296..e511cea941c8 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix index c2eb745a7e5e..5ec87f1f8794 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix index b5c99849afe5..98b7a1f8b63a 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix @@ -18,6 +18,6 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which meta = with stdenv.lib; { - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix index 0983fd266357..ea5a42433897 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Contacts; description = "Contacts is GNOME's integrated address book"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix index 5d6e504951f7..84bdb7492bb0 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to configure the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix index fc721f936489..c62cbfe72562 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix index a99ddbc9eb45..9917fd4d15c6 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix index 54034798a494..b5261c214ad1 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix index 60492c521646..1523cf14d2e2 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix index 4ed0f6c521ba..a6621aebe432 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix @@ -36,6 +36,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix index 8e0c17096420..a8e877039b20 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper , webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common , telepathy_glib, intltool, dbus_libs, icu, autoreconfHook -, libsoup, docbook_xsl_ns, docbook_xsl, gnome3 +, libsoup, docbook_xsl_ns, docbook_xsl, gnome3, hicolor_icon_theme }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook - docbook_xsl_ns docbook_xsl ]; + docbook_xsl_ns docbook_xsl hicolor_icon_theme ]; preFixup = '' for f in "$out/libexec/"*; do @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix index a44d31e9ccb1..4c879b750980 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix index d571c90f8986..559d084add19 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix index 63fea43baedf..174210393d41 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower -, libxslt, intltool, makeWrapper, systemd, xorg }: +, libxslt, intltool, makeWrapper, systemd, xorg, hicolor_icon_theme }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt - gnome3.gnome_settings_daemon xorg.xtrans + gnome3.gnome_settings_daemon xorg.xtrans hicolor_icon_theme gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ]; preFixup = '' @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix index 76c770e51d6b..2477bb7bc1ff 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix index abb7b882a2bf..1b17d1f1f53f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix index c49a4503d638..4d4656a85021 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix index f0f2f829a33c..44af987dfe4f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix index e1f4944f86cb..94c7af904ddd 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix index ccc56cfdb31f..c7432a760cf6 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix index 6e98b9817c1e..ff12622d28f0 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2, gdk_pixbuf }: +{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 +, gdk_pixbuf, hicolor_icon_theme }: stdenv.mkDerivation rec { name = "gnome-themes-standard-${gnome3.version}.0"; @@ -7,10 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0kyrbfrgl6g6wm6zpllldz36fclvl8vwmn1snwk18kf7f6ncpsac"; }; - buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf ]; + buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf + hicolor_icon_theme ]; meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix index 969459aad319..17ebc84ced8c 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}"; description = "User and system administration help for the GNOME desktop"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.cc-by-30; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix index 2d563e1f7b55..3d2011c01c68 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix index 9076d5c58390..a236238c257f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix index a9be29f2b0ed..16dfb638a249 100644 --- a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m"; }; + setupHook = ./setup-hook.sh; + configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; preConfigure = '' @@ -24,7 +26,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh new file mode 100644 index 000000000000..bc93dddec386 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh @@ -0,0 +1,7 @@ +make_grilo_find_plugins() { + if [ -d "$1"/lib/grilo-0.2 ]; then + addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2" + fi +} + +envHooks+=(make_grilo_find_plugins) diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix index a13b17fe5e0e..4030ecd5cde8 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; meta = with stdenv.lib; { - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix index a9dbbb613161..5f255743313e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool }: +{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: let majVer = "1.0"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; description = "Small library for playing system sounds"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix index 0de89bc5dd65..3aacdef9455e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix index 454196df7a6b..71a8dbf0ff84 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix index 82536735b390..4ff132950319 100644 --- a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection }: +{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }: let ver_maj = "0.16"; ver_min = "1"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix index 1156474e5a7c..4939a4ff7281 100644 --- a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "libgnomekbd-3.6.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Keyboard management library"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix index 571fc73e0398..8ba578bad2b8 100644 --- a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix index e59d81f3c1d4..1787734939d1 100644 --- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool -, glib, gtk3, gobjectIntrospection, python, pygobject3 +{ stdenv, fetchurl, pkgconfig, intltool, gnome3 +, glib, gtk3, gobjectIntrospection, python, pygobject3, hicolor_icon_theme }: let @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ intltool pkgconfig - glib gtk3 gobjectIntrospection python pygobject3 + glib gtk3 gobjectIntrospection python pygobject3 hicolor_icon_theme ]; src = fetchurl { @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix index 9b91cd987778..a60db8f93f24 100644 --- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix index 6d004ceb2a37..a4e94db0b74e 100644 --- a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix index ee22cd97f6e0..354f1715dc19 100644 --- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert }: +{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, cacert, gnome3 }: stdenv.mkDerivation rec { name = "rest-0.7.92"; @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix index 9105dd8e7367..8f7c5675cc2a 100644 --- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "http://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix index f1b3bfe53c13..63f36004bcd6 100644 --- a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup }: +{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }: stdenv.mkDerivation rec { name = "totem-pl-parser-3.10.2"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix index 511a37e09a0b..d99a24bbfa2d 100644 --- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix index 2b11c22c5f39..4265d70a4f9f 100644 --- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { 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 ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix index 3ade5f355d44..a76a2e3073ff 100644 --- a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = [licenses.gpl2 licenses.lgpl2]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix index 413042d752c5..11aaae1e6cb6 100644 --- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; description = "The help viewer in Gnome"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix index aca42f1dbc2c..9ce2726e7042 100644 --- a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix index 67236ae202bb..4d30520df117 100644 --- a/pkgs/desktops/gnome-3/3.16/default.nix +++ b/pkgs/desktops/gnome-3/3.16/default.nix @@ -21,6 +21,7 @@ let glib_networking gvfs dconf gnome-backgrounds gnome_control_center gnome-menus gnome_settings_daemon gnome_shell gnome_themes_standard defaultIconTheme gnome-shell-extensions + pkgs.hicolor_icon_theme ]; optionalPackages = with gnome3; [ baobab empathy eog epiphany evince @@ -32,7 +33,9 @@ let nautilus-sendto dconf-editor vinagre ]; - gamesPackages = with gnome3; [ swell-foop lightsoff iagno ]; + gamesPackages = with gnome3; [ swell-foop lightsoff iagno + tali quadrapassel + ]; inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra; inherit (pkgs.gnome2) ORBit2; @@ -50,6 +53,7 @@ let gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; version = "3.16"; + maintainers = with pkgs.lib.maintainers; [ lethalman ]; # Simplify the nixos module and gnome packages defaultIconTheme = adwaita-icon-theme; @@ -290,6 +294,10 @@ let swell-foop = callPackage ./games/swell-foop { }; + tali = callPackage ./games/tali { }; + + quadrapassel = callPackage ./games/quadrapassel { }; + #### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/ california = callPackage ./misc/california { }; diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix index e12f41c9b7f8..aa7aa8b469d0 100644 --- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix +++ b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix index 90d31eaa5cf0..945ae7d0fda5 100644 --- a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Iagno; description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix index e24f90812c0b..37b8337200d6 100644 --- a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Lightsoff; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix new file mode 100644 index 000000000000..98cfd55a31eb --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf +, librsvg, libcanberra_gtk3 +, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "quadrapassel-${gnome3.version}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/quadrapassel/${gnome3.version}/${name}.tar.xz"; + sha256 = "17c6ddjgmakj615ahnrmrzayjxc2ylr8dddfzi9py875q5vk7grx"; + }; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libcanberra_gtk3 itstool intltool clutter + libxml2 clutter_gtk wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Quadrapassel; + description = "Classic falling-block game, Tetris"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix index 4afe66ee5450..ff3c37c15e64 100644 --- a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Swell%20Foop"; description = "Puzzle game, previously known as Same GNOME"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix new file mode 100644 index 000000000000..a38d8845bef0 --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf +, librsvg, intltool, itstool, libxml2, wrapGAppsHook }: + +stdenv.mkDerivation rec { + name = "tali-${gnome3.version}.1"; + + src = fetchurl { + url = "mirror://gnome/sources/tali/${gnome3.version}/${name}.tar.xz"; + sha256 = "10cfgxiqg38z5ngkiznglxjgm1552mjvfw4bjhjic0yi5cvdr6dg"; + }; + + buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg + libxml2 itstool intltool wrapGAppsHook ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = https://wiki.gnome.org/Apps/Tali; + description = "Sort of poker with dice and less money"; + maintainers = gnome3.maintainers; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix index b9a62642c1df..1cf656fe7dcb 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix index 1508338f6cae..7cea9cd8d150 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4 }: +{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }: let majorVersion = "0.10"; @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/gexiv2; description = "GObject wrapper around the Exiv2 photo metadata library"; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix index d36534f0d32f..e85b087fa41f 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix index 2af75a7ffac3..2777dc5ca090 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; description = "A tool to customize advanced GNOME 3 options"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix index 3975b84a05a7..f3c751f458d9 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Clipboard management system with GNOME3 integration"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix index 49d888a866be..d86e234e80f5 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = [ maintainers.lethalman ]; + maintainers = gnome3.maintainers; }; } diff --git a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix index 5ac6b50198bd..b86480125730 100644 --- a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix +++ b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection }: +{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }: let majorVersion = "1.9"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = with maintainers; [ lethalman ]; + maintainers = gnome3.maintainers; license = licenses.gpl2; platforms = platforms.linux; }; |