Merge pull request #79939 from romildo/upd.mate

mate: update to version 1.24.0
This commit is contained in:
José Romildo Malaquias 2020-02-18 11:15:10 -03:00 committed by GitHub
commit 0bcd9a5262
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
44 changed files with 314 additions and 404 deletions

View File

@ -86,6 +86,7 @@ in
pkgs.shared-mime-info pkgs.shared-mime-info
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
pkgs.mate.mate-settings-daemon pkgs.mate.mate-settings-daemon
pkgs.yelp # for 'Contents' in 'Help' menus
]; ];
programs.dconf.enable = true; programs.dconf.enable = true;

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, glib, libxml2, libsecret, poppler, itstool, hicolor-icon-theme, texlive, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "atril"; pname = "atril";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "06hmyw7fwdrdyl3n79b8qxlrwbzf240n82arzmlg62q9zxzdc0is"; sha256 = "0967gxw7h2qh2kpwl0jgv58hicz6aa92kr12mnykbpikad25s95y";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -25,16 +25,20 @@ stdenv.mkDerivation rec {
mate.caja mate.caja
mate.mate-desktop mate.mate-desktop
hicolor-icon-theme hicolor-icon-theme
texlive.bin.core # for synctex, used by the pdf back-end
]; ];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ]; makeFlags = [ "cajaextensiondir=$$out/lib/caja/extensions-2.0" ];
meta = { enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "A simple multi-page document viewer for the MATE desktop"; description = "A simple multi-page document viewer for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
}; };
} }

View File

@ -7,11 +7,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "caja-dropbox"; pname = "caja-dropbox";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18cnd3yw2ingvl38mhmfbl5k0kfg8pzcf2649j00i6v90cwiril5"; sha256 = "1rcn82q58mv9hn5xamvzay2pw1szfk6zns94362476fcp786lji2";
}; };
patches = [ patches = [
@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-caja-extension-dir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Dropbox extension for Caja file manager"; description = "Dropbox extension for Caja file manager";
homepage = "https://github.com/mate-desktop/caja-dropbox"; homepage = "https://github.com/mate-desktop/caja-dropbox";

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "caja-extensions"; pname = "caja-extensions";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0xzhphzvaxbwyyp242pnhl5zjrkiznj90i0xjmy7pvi155pmp16h"; sha256 = "175v5c05nrdliya23rbqma49alldq67dklmvpq18nq71sfry4pp6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -31,9 +31,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Set of extensions for Caja file manager"; description = "Set of extensions for Caja file manager";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,11 +1,24 @@
From 35e9e6a6f3ba6cbe62a3957044eb67864f5d8e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 11 Feb 2020 17:49:13 -0300
Subject: [PATCH] Look for caja extentions at $CAJA_EXTENTSION_DIRS
CAJA_EXTENSION_DIRS is a list of paths where caja extensions are
looked for. It is needed for distributions like NixOS that do not
install all extensions in the same directory. In NixOS each package is
installed in a self contained directory.
---
libcaja-private/caja-module.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c diff --git a/libcaja-private/caja-module.c b/libcaja-private/caja-module.c
index 023c22e..414913b 100644 index d54d7cf..9794e56 100644
--- a/libcaja-private/caja-module.c --- a/libcaja-private/caja-module.c
+++ b/libcaja-private/caja-module.c +++ b/libcaja-private/caja-module.c
@@ -258,11 +258,25 @@ caja_module_setup (void) @@ -258,11 +258,25 @@ void
caja_module_setup (void)
{ {
static gboolean initialized = FALSE; static gboolean initialized = FALSE;
GList *res;
+ gchar *caja_extension_dirs; + gchar *caja_extension_dirs;
+ gchar **dir_vector; + gchar **dir_vector;
@ -28,3 +41,6 @@ index 023c22e..414913b 100644
load_module_dir (CAJA_EXTENSIONDIR); load_module_dir (CAJA_EXTENSIONDIR);
eel_debug_call_at_shutdown (free_module_objects); eel_debug_call_at_shutdown (free_module_objects);
--
2.25.0

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "caja"; pname = "caja";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1w2liq9h1kr5zyaaq82xz8pic04qi5sra8kaycfg1iddmknkfqn7"; sha256 = "1cnfy481hcwjv3ia3kw0d4h7ga8cng0pqm3z349v4qcmfdapmqc0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -31,9 +31,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--disable-update-mimedb" ]; configureFlags = [ "--disable-update-mimedb" ];
enableParallelBuilding = true;
meta = { meta = {
description = "File manager for the MATE desktop"; description = "File manager for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with stdenv.lib.licenses; [ gpl2 lgpl2 ]; license = with stdenv.lib.licenses; [ gpl2 lgpl2 ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "engrampa"; pname = "engrampa";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17pn1qgr1a13jxv50qcnzqcw8gr96g7jz2z2y1wbwy7i44bknv6n"; sha256 = "13cak3qgrzqj74x9jq1sf155793v2bqqz4mk4i04g9f9xn3g85fl";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -26,9 +26,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = { meta = {
description = "Archive Manager for MATE"; description = "Archive Manager for MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "eom"; pname = "eom";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0za1lw4awg1i0ls0r9iw0ail2hqa34y1dx65b50bw9kx9kbfyl9l"; sha256 = "0zzximp2534bky0vac219alafblw6m0lis0gncq92017s6c1mb77";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -30,9 +30,11 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
enableParallelBuilding = true;
meta = { meta = {
description = "An image viewing and cataloging program for the MATE desktop"; description = "An image viewing and cataloging program for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,21 +1,23 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxklavier }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmatekbd"; pname = "libmatekbd";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1dsr7618c92mhwabwhgxqsfp7gnf9zrz2z790jc5g085dxhg13y8"; sha256 = "1sq7gwr9q3hq4q0vx32qqa68qcqf5by9mqyxnq6lwgaq8ydq16ab";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ gtk3 libxklavier ]; buildInputs = [ gtk3 libxklavier ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Keyboard management library for MATE"; description = "Keyboard management library for MATE";
homepage = https://github.com/mate-desktop/libmatekbd; homepage = "https://github.com/mate-desktop/libmatekbd";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,4 +1,4 @@
{ config, stdenv, fetchurl, pkgconfig, intltool, glib { config, stdenv, fetchurl, pkgconfig, gettext, glib
, alsaSupport ? stdenv.isLinux, alsaLib , alsaSupport ? stdenv.isLinux, alsaLib
, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio
, ossSupport ? false , ossSupport ? false
@ -6,14 +6,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmatemixer"; pname = "libmatemixer";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1v0gpr55gj4mj8hzxbhgzrmhaxvs2inxhsmirvjw39sc7iplvrh9"; sha256 = "08vkdp2kzy27xwscwp2jj5nz0yblrka2482l6cx3wl4dnk0rpznm";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ glib ] buildInputs = [ glib ]
++ stdenv.lib.optional alsaSupport alsaLib ++ stdenv.lib.optional alsaSupport alsaLib
@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
configureFlags = stdenv.lib.optional ossSupport "--enable-oss"; configureFlags = stdenv.lib.optional ossSupport "--enable-oss";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Mixer library for MATE"; description = "Mixer library for MATE";
homepage = https://github.com/mate-desktop/libmatemixer; homepage = "https://github.com/mate-desktop/libmatemixer";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libsoup, tzdata }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libmateweather"; pname = "libmateweather";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1y3z82ymc7q6z8ly9f6nys0hbs373fjnvr6j7zwlgf6zc88f71h3"; sha256 = "094mnlczxq9crjj8z7dzs1zmwscdkbp54l3qjaf4a4bhd8lihv8d";
}; };
nativeBuildInputs = [ pkgconfig intltool ]; nativeBuildInputs = [ pkgconfig gettext ];
buildInputs = [ gtk3 libsoup tzdata ]; buildInputs = [ gtk3 libsoup tzdata ];
@ -20,9 +20,11 @@ stdenv.mkDerivation rec {
preFixup = "rm -f $out/share/icons/mate/icon-theme.cache"; preFixup = "rm -f $out/share/icons/mate/icon-theme.cache";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library to access weather information from online services for MATE"; description = "Library to access weather information from online services for MATE";
homepage = https://github.com/mate-desktop/libmateweather; homepage = "https://github.com/mate-desktop/libmateweather";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "marco"; pname = "marco";
version = "1.22.4"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0z8q4nwm43imbnbxz348ylgzfl25sknb19kml57d6z6flxws19k3"; sha256 = "0hcbyv8czymhwz5q9rwig7kkhlhik6y080bls736f3wsbqnnirc2";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -23,11 +23,14 @@ stdenv.mkDerivation rec {
libstartup_notification libstartup_notification
gtk3 gtk3
gnome3.zenity gnome3.zenity
mate-settings-daemon
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE default window manager"; description = "MATE default window manager";
homepage = https://github.com/mate-desktop/marco; homepage = "https://github.com/mate-desktop/marco";
license = [ licenses.gpl2 ]; license = [ licenses.gpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-applets"; pname = "mate-applets";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1c32rkkry6kka2arrx5psjj037j79icp5jr1s0qh596dvsgxciqc"; sha256 = "0nm3amb3v458mxv1mbz9y8f4230gldmydmkkm7vqxsrxbccynkxq";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -36,9 +36,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Applets for use with the MATE panel"; description = "Applets for use with the MATE panel";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,19 +1,21 @@
{ stdenv, fetchurl, intltool }: { stdenv, fetchurl, gettext }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-backgrounds"; pname = "mate-backgrounds";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1j9ch04qi2q4mdcvb92w667ra9hpfdf2bfpi1dpw0nbph7r6qvj9"; sha256 = "16rmsy02fyq6mj6xgc5mdyh146z3zmkn7iwsi44s962aqwbpn4i8";
}; };
nativeBuildInputs = [ intltool ]; nativeBuildInputs = [ gettext ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Background images and data for MATE"; description = "Background images and data for MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-calc"; pname = "mate-calc";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1as4gshydcf84vynq8ijd9n8pslz5jpw6aj18ri4bdc91a6q3rpg"; sha256 = "0f7hc1gg41kcwcyvsqqg79qylrp0qqymris8qizk2x3cfvvg7261";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
libxml2 libxml2
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Calculator for the MATE desktop"; description = "Calculator for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -2,16 +2,18 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-common"; pname = "mate-common";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1xx7qrw8kc6355r1a1nybncf8s2rxjb2nqzw0gv2r5j5sqx8fzgf"; sha256 = "06w25mk2w7rfnkwpnav8pcrvip1zdd0zd1qc6d975ksmg66r1vz7";
}; };
enableParallelBuilding = true;
meta = { meta = {
description = "Common files for development of MATE packages"; description = "Common files for development of MATE packages";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl3; license = stdenv.lib.licenses.gpl3;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,81 +0,0 @@
From 74fb65a2574c93a2b20a51875a5e336f727ff4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 25 Dec 2019 18:48:38 -0300
Subject: [PATCH] Search system themes in system data dirs
---
capplets/common/gtkrc-utils.c | 20 ++++++++++++--------
capplets/common/mate-theme-info.c | 18 +++++++++++-------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/capplets/common/gtkrc-utils.c b/capplets/common/gtkrc-utils.c
index 011c8a1..27e01da 100644
--- a/capplets/common/gtkrc-utils.c
+++ b/capplets/common/gtkrc-utils.c
@@ -60,15 +60,19 @@ gchar* gtkrc_find_named(const gchar* name)
if (!path)
{
- gchar* theme_dir = gtk_rc_get_theme_dir();
- path = g_build_filename(theme_dir, name, subpath, NULL);
- g_free(theme_dir);
+ const gchar * const * dirs = g_get_system_data_dirs();
- if (!g_file_test(path, G_FILE_TEST_EXISTS))
- {
- g_free (path);
- path = NULL;
- }
+ if (dirs != NULL)
+ for (; !path && *dirs != NULL; ++dirs)
+ {
+ path = g_build_filename(*dirs, "themes", name, subpath, NULL);
+
+ if (!g_file_test(path, G_FILE_TEST_EXISTS))
+ {
+ g_free (path);
+ path = NULL;
+ }
+ }
}
return path;
diff --git a/capplets/common/mate-theme-info.c b/capplets/common/mate-theme-info.c
index 54ae3ae..a738f0b 100644
--- a/capplets/common/mate-theme-info.c
+++ b/capplets/common/mate-theme-info.c
@@ -1763,6 +1763,7 @@ mate_theme_color_scheme_equal (const gchar *s1, const gchar *s2)
void
mate_theme_init ()
{
+ const gchar * const * dirs;
GFile *top_theme_dir;
gchar *top_theme_dir_string;
static gboolean initted = FALSE;
@@ -1783,13 +1784,16 @@ mate_theme_init ()
theme_hash_by_uri = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
theme_hash_by_name = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
- /* Add all the toplevel theme dirs. */
- /* $datadir/themes */
- top_theme_dir_string = gtk_rc_get_theme_dir ();
- top_theme_dir = g_file_new_for_path (top_theme_dir_string);
- g_free (top_theme_dir_string);
- add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
- g_object_unref (top_theme_dir);
+ /* Add all the toplevel theme dirs following the XDG Base Directory Specification */
+ dirs = g_get_system_data_dirs ();
+ if (dirs != NULL)
+ for (; *dirs != NULL; ++dirs) {
+ top_theme_dir_string = g_build_filename (*dirs, "themes", NULL);
+ top_theme_dir = g_file_new_for_path (top_theme_dir_string);
+ g_free (top_theme_dir_string);
+ add_top_theme_dir_monitor (top_theme_dir, 1, NULL);
+ g_object_unref (top_theme_dir);
+ }
/* ~/.themes */
top_theme_dir_string = g_build_filename (g_get_home_dir (), ".themes", NULL);
--
2.24.1

View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus-glib, { stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib,
libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3,
desktop-file-utils, dconf, gtk3, mate, hicolor-icon-theme, wrapGAppsHook desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-control-center"; pname = "mate-control-center";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ybdjibi6wgqn3587a66ckxp2qkvl4mcvv2smhflyxksl5djrjgh"; sha256 = "192plsh83m2qz7jgakns2yvhqbj53v7i54iwb0z26i2awy0j9rcd";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
desktop-file-utils desktop-file-utils
wrapGAppsHook wrapGAppsHook
@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
libappindicator-gtk3 libappindicator-gtk3
gtk3 gtk3
dconf dconf
polkit
hicolor-icon-theme hicolor-icon-theme
mate.mate-desktop mate.mate-desktop
mate.libmatekbd mate.libmatekbd
@ -37,13 +38,6 @@ stdenv.mkDerivation rec {
mate.mate-settings-daemon mate.mate-settings-daemon
]; ];
patches = [
# see https://github.com/mate-desktop/mate-control-center/pull/528
./0001-Search-system-themes-in-system-data-dirs.patch
# look up keyboard shortcuts in system data dirs
./mate-control-center.keybindings-dir.patch
];
configureFlags = [ "--disable-update-mimedb" ]; configureFlags = [ "--disable-update-mimedb" ];
preFixup = '' preFixup = ''
@ -57,7 +51,7 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Utilities to configure the MATE desktop"; description = "Utilities to configure the MATE desktop";
homepage = https://github.com/mate-desktop/mate-control-center; homepage = "https://github.com/mate-desktop/mate-control-center";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,106 +0,0 @@
From faeb322b01d3856f3cf163470cc38f4e88a8527c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 28 Apr 2019 21:45:39 -0300
Subject: [PATCH] Use system data dirs to locate key bindings
---
capplets/keybindings/Makefile.am | 3 +-
.../keybindings/mate-keybinding-properties.c | 58 ++++++++++++-------
2 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am
index e5efb109..9501dd8f 100644
--- a/capplets/keybindings/Makefile.am
+++ b/capplets/keybindings/Makefile.am
@@ -33,8 +33,7 @@ AM_CPPFLAGS = \
$(MATECC_CAPPLETS_CFLAGS) \
-DMATELOCALEDIR="\"$(datadir)/locale\"" \
-DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \
- -DMATECC_UI_DIR="\"$(uidir)\"" \
- -DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\""
+ -DMATECC_UI_DIR="\"$(uidir)\""
CLEANFILES = \
$(MATECC_CAPPLETS_CLEANFILES) \
$(desktop_DATA) \
diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c
index 4f257333..cf1891d2 100644
--- a/capplets/keybindings/mate-keybinding-properties.c
+++ b/capplets/keybindings/mate-keybinding-properties.c
@@ -1033,39 +1033,57 @@ static void
reload_key_entries (GtkBuilder *builder)
{
gchar **wm_keybindings;
- GDir *dir;
- const char *name;
GList *list, *l;
+ const gchar * const * data_dirs;
+ GHashTable *loaded_files;
+ guint i;
wm_keybindings = wm_common_get_current_keybindings();
clear_old_model (builder);
- dir = g_dir_open (MATECC_KEYBINDINGS_DIR, 0, NULL);
- if (!dir)
- return;
-
- list = NULL;
- for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
+ loaded_files = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
+ data_dirs = g_get_system_data_dirs ();
+ for (i = 0; data_dirs[i] != NULL; i++)
{
- if (g_str_has_suffix (name, ".xml"))
+ g_autofree gchar *dir_path = NULL;
+ GDir *dir;
+ const gchar *name;
+
+ dir_path = g_build_filename (data_dirs[i], "mate-control-center", "keybindings", NULL);
+ g_debug ("Keybinding dir: %s", dir_path);
+
+ dir = g_dir_open (dir_path, 0, NULL);
+ if (!dir)
+ continue;
+
+ for (name = g_dir_read_name (dir) ; name ; name = g_dir_read_name (dir))
{
- list = g_list_insert_sorted (list, g_strdup (name),
- (GCompareFunc) g_ascii_strcasecmp);
- }
- }
- g_dir_close (dir);
+ if (g_str_has_suffix (name, ".xml") == FALSE)
+ continue;
+
+ if (g_hash_table_lookup (loaded_files, name) != NULL)
+ {
+ g_debug ("Not loading %s, it was already loaded from another directory", name);
+ continue;
+ }
+ g_hash_table_insert (loaded_files, g_strdup (name), g_strdup (dir_path));
+ }
+
+ g_dir_close (dir);
+ }
+ list = g_hash_table_get_keys (loaded_files);
+ list = g_list_sort(list, (GCompareFunc) g_str_equal);
for (l = list; l != NULL; l = l->next)
{
- gchar *path;
-
- path = g_build_filename (MATECC_KEYBINDINGS_DIR, l->data, NULL);
- append_keys_to_tree_from_file (builder, path, wm_keybindings);
- g_free (l->data);
- g_free (path);
+ g_autofree gchar *path = NULL;
+ path = g_build_filename (g_hash_table_lookup (loaded_files, l->data), l->data, NULL);
+ g_debug ("Keybinding file: %s", path);
+ append_keys_to_tree_from_file (builder, path, wm_keybindings);
}
g_list_free (list);
+ g_hash_table_destroy (loaded_files);
/* Load custom shortcuts _after_ system-provided ones,
* since some of the custom shortcuts may also be listed

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-desktop"; pname = "mate-desktop";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "18w5r9p3bqpvxqqy2am7z686xf65cz5vhj247kki8s2yvvap6rlh"; sha256 = "0l4bbj6nz315s5ndq5sw1jcgi3s1whk59bj12c4mbpsvmlb33adg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -21,9 +21,11 @@ stdenv.mkDerivation rec {
isocodes isocodes
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Library with common API for various MATE modules"; description = "Library with common API for various MATE modules";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
done done
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "Faenza icon theme from MATE"; description = "Faenza icon theme from MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }: { stdenv, fetchurl, pkgconfig, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-icon-theme"; pname = "mate-icon-theme";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0r2bk4flb6kjj97badj2lnml4lfwpl2ym5hkf7r6f7cj8g6pzc4r"; sha256 = "0a2lz61ivwwcdznmwlmgjr6ipr9sdl5g2czbagnpxkwz8f3m77na";
}; };
nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; nativeBuildInputs = [ pkgconfig gettext iconnamingutils ];
buildInputs = [ librsvg ]; buildInputs = [ librsvg ];
@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
done done
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "Icon themes from MATE"; description = "Icon themes from MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.lgpl3; license = stdenv.lib.licenses.lgpl3;
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-indicator-applet"; pname = "mate-indicator-applet";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "05j5s6r4kx1rbz0j7a7xv38d0kbdi1r8iv8b6nx3lkbkdzq1x0w2"; sha256 = "0m7pvbs5hhy5f400wqb8wp0dw3pyjpjnjax9qzc73j97l1k3zawf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mate-desktop/mate-indicator-applet; homepage = "https://github.com/mate-desktop/mate-indicator-applet";
description = "MATE panel indicator applet"; description = "MATE panel indicator applet";
longDescription = '' longDescription = ''
A small applet to display information from various applications A small applet to display information from various applications

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, intltool, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-media"; pname = "mate-media";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m8q2rqbxzvh82yj63syd8sbfjrc8y4a8caa42zs66j9x60d1agw"; sha256 = "1d5dx79yfqghjaxrdrdh053nfnvkbx8p3ma7j87s7rsvy5irs963";
}; };
buildInputs = [ buildInputs = [
@ -20,14 +20,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
libtool libtool
wrapGAppsHook wrapGAppsHook
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Media tools for MATE"; description = "Media tools for MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo maintainers.chpatrick ]; maintainers = [ maintainers.romildo maintainers.chpatrick ];

View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, gobject-introspection, python3 }: { stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-menus"; pname = "mate-menus";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0kh6y76f1rhp3nr22rp93bx77wcgqnygag2ir076cqkppayjc3c0"; sha256 = "1vv4j38h7mrbfrsj99k25z6y7b5dg30fzd2qnhk7pl8ca8s1jhrd";
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection ]; nativeBuildInputs = [ pkgconfig gettext gobject-introspection ];
buildInputs = [ glib python3 ]; buildInputs = [ glib python3 ];
@ -18,9 +18,11 @@ stdenv.mkDerivation rec {
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Menu system for MATE"; description = "Menu system for MATE";
homepage = https://github.com/mate-desktop/mate-menus; homepage = "https://github.com/mate-desktop/mate-menus";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-netbook"; pname = "mate-netbook";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0m38v2276s2d3zs7smxyf70nyl7bcwp5665zgva28lvs8ip3gijx"; sha256 = "1bmk9gq5gcqkvfppa7i1hqfph8sajc3xs189s4ha97g0ifwd98a8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
mate.mate-panel mate.mate-panel
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE utilities for netbooks"; description = "MATE utilities for netbooks";
longDescription = '' longDescription = ''
@ -32,7 +34,7 @@ stdenv.mkDerivation rec {
Installing these utilities is recommended for netbooks and similar Installing these utilities is recommended for netbooks and similar
devices with low resolution displays. devices with low resolution displays.
''; '';
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl3 lgpl2Plus ]; license = with licenses; [ gpl3 lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,18 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, libcanberra-gtk3, { stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3,
libnotify, libwnck3, gtk3, wrapGAppsHook }: libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-notification-daemon"; pname = "mate-notification-daemon";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0f8m3m94iqj2x61dzwwvwq2qlsl2ma8pqr6rfns5pzd0nj0waz0m"; sha256 = "0y362b51lb8nq2cw254qc39x8hpficn5rxddzp0fxqxakrh7vcif";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
libxml2 # for xmllint
wrapGAppsHook wrapGAppsHook
]; ];
@ -25,9 +26,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Notification daemon for MATE"; description = "Notification daemon for MATE Desktop";
homepage = https://github.com/mate-desktop/mate-notification-daemon; homepage = "https://github.com/mate-desktop/mate-notification-daemon";
license = licenses.gpl2; license = licenses.gpl2;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-panel"; pname = "mate-panel";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1sm0fniywcxg8rbakhhc37bamwq1x3jqqyaqcvqwxvm6jg1hc97y"; sha256 = "1hrh10pqk8mva1ix2nmsp3cbbn81cgqy0b9lqhsl0b5p0s40i7in";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
intltool gettext
itstool itstool
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
@ -37,9 +37,11 @@ stdenv.mkDerivation rec {
"INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0" "INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0"
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The MATE panel"; description = "The MATE panel";
homepage = https://github.com/mate-desktop/mate-panel; homepage = "https://github.com/mate-desktop/mate-panel";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-polkit"; pname = "mate-polkit";
version = "1.22.0"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "02r8n71xflhvw2hsf6g4svdahzyg3r4n6xamasyzqfhyn0mqmjy0"; sha256 = "1450bqzlnvwy3xa98lj102j2cf7piqbxcd1cy2zp41rdl8ri3gvn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
gobject-introspection gobject-introspection
intltool gettext
pkgconfig pkgconfig
]; ];
@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
polkit polkit
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Integrates polkit authentication for MATE desktop"; description = "Integrates polkit authentication for MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,14 +1,21 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-power-manager"; pname = "mate-power-manager";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "12pnj7y01k1fhfhswxmf6q9yyb0772am5anm338hzfhjp0lcxlbn"; sha256 = "1h6wm8vna97iayhwqh7rfsc87715np12nxa72w27p4zl54bdkdlg";
}; };
nativeBuildInputs = [
pkgconfig
gettext
libtool
wrapGAppsHook
];
buildInputs = [ buildInputs = [
glib glib
itstool itstool
@ -19,23 +26,19 @@ stdenv.mkDerivation rec {
libnotify libnotify
dbus-glib dbus-glib
upower upower
polkit
mate.mate-panel mate.mate-panel
]; ];
nativeBuildInputs = [
pkgconfig
intltool
libtool
wrapGAppsHook
];
configureFlags = [ "--enable-applets" ]; configureFlags = [ "--enable-applets" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The MATE Power Manager"; description = "The MATE Power Manager";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo maintainers.chpatrick ]; maintainers = with maintainers; [ romildo chpatrick ];
}; };
} }

View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, dbus-glib, libXScrnSaver, libnotify, pam, systemd, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-screensaver"; pname = "mate-screensaver";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1y8828g4bys8y4r5y478z6i7dgdqm2wkymi5fq75vxx4lzq919cb"; sha256 = "0gpw6x9d0b77f14vjl7ghq5dya1mwcnvmgigg00manfwlksr5zby";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
libxml2 # provides xmllint
wrapGAppsHook wrapGAppsHook
]; ];
@ -30,9 +31,11 @@ stdenv.mkDerivation rec {
makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ]; makeFlags = [ "DBUS_SESSION_SERVICE_DIR=$(out)/etc" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Screen saver and locker for the MATE desktop"; description = "Screen saver and locker for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-sensors-applet"; pname = "mate-sensors-applet";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0rv19jxxviqqwk2wlhxlm98jsxa26scvs7ilp2i6plhn3ap2alq3"; sha256 = "1izjgzj3xb93arim8w891x8as85phdmlhdnr2yc8ixg7xpblsq2s";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -28,8 +28,10 @@ stdenv.mkDerivation rec {
hicolor-icon-theme hicolor-icon-theme
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/mate-desktop/mate-sensors-applet; homepage = "https://github.com/mate-desktop/mate-sensors-applet";
description = "MATE panel applet for hardware sensors"; description = "MATE panel applet for hardware sensors";
license = with licenses; [ gpl2Plus ]; license = with licenses; [ gpl2Plus ];
platforms = platforms.linux; platforms = platforms.linux;

View File

@ -1,20 +1,20 @@
{ stdenv, fetchurl, pkgconfig, intltool, xtrans, dbus-glib, systemd, { stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd,
libSM, libXtst, gtk3, hicolor-icon-theme, mate, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate,
wrapGAppsHook wrapGAppsHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-session-manager"; pname = "mate-session-manager";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1ys26af75xl1psck8v32gygxipd8ms1xgpvdhwmnj7bqhabhh249"; sha256 = "01scj5d1xlri9b2id8gm9kfni9nzhdjdf7rag7fvcxwqp7baz3h3";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
xtrans xtrans
wrapGAppsHook wrapGAppsHook
]; ];
@ -27,11 +27,15 @@ stdenv.mkDerivation rec {
gtk3 gtk3
mate.mate-desktop mate.mate-desktop
hicolor-icon-theme hicolor-icon-theme
epoxy
polkit
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE Desktop session manager"; description = "MATE Desktop session manager";
homepage = https://github.com/mate-desktop/mate-session-manager; homepage = "https://github.com/mate-desktop/mate-session-manager";
license = with licenses; [ gpl2 lgpl2 ]; license = with licenses; [ gpl2 lgpl2 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,28 +1,19 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier, { stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier,
libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate,
pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
wrapGAppsHook, fetchpatch, autoreconfHook }: wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-settings-daemon"; pname = "mate-settings-daemon";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0idw02z0iig0pfxvlhc4dq4sr7kl1w50xscvg0jzzswnxid2l4ip"; sha256 = "1hc5a36wqpjv9i2lgrn1h12s8y910xab3phx5vzbzq47kj6m3gw9";
}; };
patches = [
# Don't use etc/dbus-1/system.d
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-settings-daemon/pull/296.patch";
sha256 = "00dfn8h47zw3wr7yya82vvp19wsw51whn8jwgayn4hkjd161s9nm";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
autoreconfHook # drop with the above patch gettext
intltool
pkgconfig pkgconfig
wrapGAppsHook wrapGAppsHook
]; ];
@ -45,9 +36,11 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE settings daemon"; description = "MATE settings daemon";
homepage = https://github.com/mate-desktop/mate-settings-daemon; homepage = "https://github.com/mate-desktop/mate-settings-daemon";
license = with licenses; [ gpl2 lgpl21 ]; license = with licenses; [ gpl2 lgpl21 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, systemd, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-system-monitor"; pname = "mate-system-monitor";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1d4l5rv01343jf8bk2j5hxvrbp3d705nd4v2pdrjn4h5dw8nxsl1"; sha256 = "1cb36lrsn4fhsryl2kl4yq0qhp1p4r7k21w3fc2ywjga8fdxx6y5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
wrapGAppsHook wrapGAppsHook
]; ];
@ -22,14 +22,17 @@ stdenv.mkDerivation rec {
libgtop libgtop
libwnck3 libwnck3
librsvg librsvg
polkit
systemd systemd
]; ];
configureFlags = [ "--enable-systemd" ]; configureFlags = [ "--enable-systemd" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "System monitor for the MATE desktop"; description = "System monitor for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,12 +1,12 @@
{ stdenv, fetchurl, pkgconfig, intltool, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-terminal"; pname = "mate-terminal";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "08210ry5lrivsgzqpdaxrchhpj0n5s1q0x4pxmwdpnksjpcj11mn"; sha256 = "0nc23nmbkya2fgf7j65z85dcibwi5akkr8nscqrvk039ckirhk97";
}; };
buildInputs = [ buildInputs = [
@ -23,14 +23,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
wrapGAppsHook wrapGAppsHook
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "The MATE Terminal Emulator"; description = "The MATE Terminal Emulator";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ];
}; };
} }

View File

@ -20,9 +20,11 @@ stdenv.mkDerivation rec {
gtk-update-icon-cache "$out"/share/icons/ContrastHigh gtk-update-icon-cache "$out"/share/icons/ContrastHigh
''; '';
enableParallelBuilding = true;
meta = { meta = {
description = "A set of themes from MATE"; description = "A set of themes from MATE";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.lgpl21; license = stdenv.lib.licenses.lgpl21;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,21 +1,28 @@
{ stdenv, fetchurl, intltool, itstool, libxml2, yelp }: { stdenv, fetchurl, gettext, itstool, libxml2, yelp }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-user-guide"; pname = "mate-user-guide";
version = "1.22.3"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "0zv8arsxnbab0qk3ck9i1wp3d4gfclcv6vq6nh5i8zjz6rpp9cjs"; sha256 = "0ddxya84iydvy85dbqls0wmz2rph87wri3rsdhv4rkbhh5g4sd7f";
}; };
nativeBuildInputs = [ itstool intltool libxml2 ]; nativeBuildInputs = [ itstool gettext libxml2 ];
buildInputs = [ yelp ]; buildInputs = [ yelp ];
postPatch = ''
substituteInPlace mate-user-guide.desktop.in.in \
--replace "Exec=yelp" "Exec=${yelp}/bin/yelp"
'';
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE User Guide"; description = "MATE User Guide";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus fdl12 ]; license = with licenses; [ gpl2Plus fdl12 ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-user-share"; pname = "mate-user-share";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1krsar1pwa8720qz2dckcg0f6z9mvfk49djdxaz1afvi7blmqd6k"; sha256 = "1h4aabcby96nsg557brzzb0an1qvnawhim2rinzlzg4fhkvdfnr5";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
libxml2 libxml2
wrapGAppsHook wrapGAppsHook
@ -42,9 +42,11 @@ stdenv.mkDerivation rec {
"--with-cajadir=$(out)/lib/caja/extensions-2.0" "--with-cajadir=$(out)/lib/caja/extensions-2.0"
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "User level public file sharing for the MATE desktop"; description = "User level public file sharing for the MATE desktop";
homepage = https://github.com/mate-desktop/mate-user-share; homepage = "https://github.com/mate-desktop/mate-user-share";
license = with licenses; [ gpl2Plus ]; license = with licenses; [ gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, mate, hicolor-icon-theme, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "mate-utils"; pname = "mate-utils";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1i6fnm3y1hj8r57x4jpc4ixqs77zln8f7477d0haypflxm3s4kjr"; sha256 = "1b16n1628gcsym5mph6lr9x5xm4rgkxsa8xwr2wlx8g2gw2775i1";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
itstool itstool
inkscape inkscape
wrapGAppsHook wrapGAppsHook
@ -22,13 +22,18 @@ stdenv.mkDerivation rec {
libgtop libgtop
libcanberra-gtk3 libcanberra-gtk3
libxml2 libxml2
udisks2
mate.mate-panel mate.mate-panel
hicolor-icon-theme hicolor-icon-theme
]; ];
NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0";
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Utilities for the MATE desktop"; description = "Utilities for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = with licenses; [ gpl2Plus lgpl2Plus ]; license = with licenses; [ gpl2Plus lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,26 +1,28 @@
{ stdenv, python3, fetchurl, pkgconfig, intltool, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }: { stdenv, python3, fetchurl, pkgconfig, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection }:
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "mozo"; pname = "mozo";
version = "1.22.2"; version = "1.24.0";
format = "other"; format = "other";
doCheck = false; doCheck = false;
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1lzcwsz940v218frwzhpywp1an9x3cgfvqr7r8dplpdapvd0khrs"; sha256 = "01lyi47a04xk0by5bvnfmqgv5sysk2wdlri6a4ssmy1qhgwh9zr3";
}; };
nativeBuildInputs = [ pkgconfig intltool gobject-introspection wrapGAppsHook ]; nativeBuildInputs = [ pkgconfig gettext gobject-introspection wrapGAppsHook ];
propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ]; propagatedBuildInputs = [ mate.mate-menus python3.pkgs.pygobject3 ];
buildInputs = [ gtk3 glib ]; buildInputs = [ gtk3 glib ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "MATE Desktop menu editor"; description = "MATE Desktop menu editor";
homepage = https://github.com/mate-desktop/mozo; homepage = "https://github.com/mate-desktop/mozo";
license = with licenses; [ lgpl2Plus ]; license = with licenses; [ lgpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -1,17 +1,18 @@
{ stdenv, fetchurl, pkgconfig, intltool, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }: { stdenv, fetchurl, pkgconfig, gettext, perl, itstool, isocodes, enchant, libxml2, python3, gnome3, gtksourceview3, libpeas, mate, wrapGAppsHook }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pluma"; pname = "pluma";
version = "1.22.2"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "1gsj8grdhzb1jvl5zwd8zjc9cj9ys2ndny04gy4bbh80sjaj6xva"; sha256 = "1vmndhlhy3qkf3xs5kkv0xhbv5ar25pqz0kp17hc4qhgjzycfr0r";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
perl
itstool itstool
isocodes isocodes
wrapGAppsHook wrapGAppsHook
@ -27,9 +28,11 @@ stdenv.mkDerivation rec {
mate.mate-desktop mate.mate-desktop
]; ];
enableParallelBuilding = true;
meta = { meta = {
description = "Powerful text editor for the MATE desktop"; description = "Powerful text editor for the MATE desktop";
homepage = https://mate-desktop.org; homepage = "https://mate-desktop.org";
license = stdenv.lib.licenses.gpl2; license = stdenv.lib.licenses.gpl2;
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
maintainers = [ stdenv.lib.maintainers.romildo ]; maintainers = [ stdenv.lib.maintainers.romildo ];

View File

@ -1,17 +1,17 @@
{ stdenv, fetchurl, pkgconfig, intltool, gtk3, mate, python3Packages }: { stdenv, fetchurl, pkgconfig, gettext, gtk3, mate, python3Packages }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "python-caja"; pname = "python-caja";
version = "1.22.1"; version = "1.24.0";
src = fetchurl { src = fetchurl {
url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; url = "https://pub.mate-desktop.org/releases/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "07hkvs4a6anrvh28zjsrj8anbcz32p19hslhq66yhcvh0hh4kvqk"; sha256 = "1wp61q64cgzr3syd3niclj6rjk87wlib5m86i0myf5ph704r3qgg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkgconfig pkgconfig
intltool gettext
python3Packages.wrapPython python3Packages.wrapPython
]; ];
@ -24,9 +24,11 @@ stdenv.mkDerivation rec {
configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ]; configureFlags = [ "--with-cajadir=$$out/lib/caja/extensions-2.0" ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Python binding for Caja components"; description = "Python binding for Caja components";
homepage = https://github.com/mate-desktop/python-caja; homepage = "https://github.com/mate-desktop/python-caja";
license = [ licenses.gpl2Plus ]; license = [ licenses.gpl2Plus ];
platforms = platforms.unix; platforms = platforms.unix;
maintainers = [ maintainers.romildo ]; maintainers = [ maintainers.romildo ];

View File

@ -7,7 +7,7 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
root=../../.. root=../../..
export NIXPKGS_ALLOW_UNFREE=1 export NIXPKGS_ALLOW_UNFREE=1
mate_version=1.22 mate_version=1.24
theme_version=3.22 theme_version=3.22
materepo=https://pub.mate-desktop.org/releases/${mate_version} materepo=https://pub.mate-desktop.org/releases/${mate_version}
themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version} themerepo=https://pub.mate-desktop.org/releases/themes/${theme_version}