Merge pull request #28871 from romildo/mate

mate desktop: some improvements
This commit is contained in:
Frederik Rietdijk 2017-09-02 13:21:40 +02:00 committed by GitHub
commit c2e23a4948
11 changed files with 58 additions and 15 deletions

View file

@ -60,10 +60,7 @@ in
'';
};
environment.systemPackages = [
pkgs.hicolor_icon_theme
pkgs.mate.mate-icon-theme
] ++
environment.systemPackages =
pkgs.mate.basePackages ++
(removePackagesByName
pkgs.mate.extraPackages

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "atril-${version}";
@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
libsecret
libxml2
poppler
hicolor_icon_theme
mate.mate-desktop
];

View file

@ -23,6 +23,7 @@ let
mate-icon-theme = callPackage ./mate-icon-theme { };
mate-icon-theme-faenza = callPackage ./mate-icon-theme-faenza { };
mate-menus = callPackage ./mate-menus { };
mate-notification-daemon = callPackage ./mate-notification-daemon { };
mate-panel = callPackage ./mate-panel { };
mate-session-manager = callPackage ./mate-session-manager { };
mate-settings-daemon = callPackage ./mate-settings-daemon { };
@ -41,6 +42,7 @@ let
mate-desktop
mate-icon-theme
mate-menus
mate-notification-daemon
mate-panel
mate-session-manager
mate-settings-daemon

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "engrampa-${version}";
@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
libxml2
gnome3.gtk
mate.caja
hicolor_icon_theme
mate.mate-desktop
];

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "eom-${version}";
@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
pkgconfig
intltool
itstool
hicolor_icon_theme
wrapGAppsHook
];

View file

@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
"--enable-locations-compression"
];
preFixup = "rm -f $out/share/icons/mate/icon-theme.cache";
meta = with stdenv.lib; {
description = "Library to access weather information from online services for MATE";
homepage = https://github.com/mate-desktop/libmateweather;

View file

@ -1,4 +1,7 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, desktop_file_utils, gnome3, mate, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib,
libxklavier, libcanberra_gtk3, librsvg, libappindicator-gtk3,
desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook
}:
stdenv.mkDerivation rec {
name = "mate-control-center-${version}";
@ -24,8 +27,11 @@ stdenv.mkDerivation rec {
dbus_glib
libxklavier
libcanberra_gtk3
librsvg
libappindicator-gtk3
gnome3.gtk
gnome3.dconf
hicolor_icon_theme
mate.mate-desktop
mate.libmatekbd
mate.mate-menus

View file

@ -20,11 +20,6 @@ stdenv.mkDerivation rec {
buildInputs = [
gnome3.dconf
gnome3.gtk
gnome3.defaultIconTheme
];
propagatedUserEnvPkgs = [
gnome3.gnome_themes_standard
];
meta = with stdenv.lib; {

View file

@ -0,0 +1,36 @@
{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, libcanberra_gtk3,
libnotify, libwnck3, gnome3, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-notification-daemon-${version}";
version = "${major-ver}.${minor-ver}";
major-ver = "1.18";
minor-ver = "0";
src = fetchurl {
url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz";
sha256 = "0rhhv99ipxy7l4fdgwvqp3g0c3d4njq0fhkag2vs1nwc6kx0h7sc";
};
nativeBuildInputs = [
pkgconfig
intltool
wrapGAppsHook
];
buildInputs = [
dbus_glib
libcanberra_gtk3
libnotify
libwnck3
gnome3.gtk
];
meta = with stdenv.lib; {
description = "Notification daemon for MATE";
homepage = https://github.com/mate-desktop/mate-notification-daemon;
license = licenses.gpl2;
platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
};
}

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-panel-${version}";
@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
libwnck3
librsvg
libxml2
hicolor_icon_theme
gnome3.gtk
gnome3.dconf
mate.libmateweather

View file

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, wrapGAppsHook }:
{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }:
stdenv.mkDerivation rec {
name = "mate-session-manager-${version}";
@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
dbus_glib
systemd
xtrans
hicolor_icon_theme
xorg.libSM
gnome3.gtk3
gnome3.gsettings_desktop_schemas