From deeb80c04abf0d19fb0159a48df6cc4649774ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Tue, 12 Jul 2022 08:56:56 -0300 Subject: [PATCH] mate: reformat nix expressions --- pkgs/desktops/mate/atril/default.nix | 17 +++++--- pkgs/desktops/mate/caja-dropbox/default.nix | 16 +++++-- .../desktops/mate/caja-extensions/default.nix | 16 ++++++- .../mate/caja-with-extensions/default.nix | 13 +++++- pkgs/desktops/mate/caja/default.nix | 16 ++++++- pkgs/desktops/mate/engrampa/default.nix | 15 ++++++- pkgs/desktops/mate/eom/default.nix | 21 ++++++++- pkgs/desktops/mate/libmatekbd/default.nix | 20 +++++++-- pkgs/desktops/mate/libmatemixer/default.nix | 27 +++++++++--- pkgs/desktops/mate/libmateweather/default.nix | 22 ++++++++-- pkgs/desktops/mate/marco/default.nix | 21 ++++++++- pkgs/desktops/mate/mate-applets/default.nix | 29 +++++++++++-- .../mate/mate-backgrounds/default.nix | 10 ++++- pkgs/desktops/mate/mate-calc/default.nix | 14 +++++- pkgs/desktops/mate/mate-common/default.nix | 6 ++- .../mate/mate-control-center/default.nix | 23 ++++++++-- pkgs/desktops/mate/mate-desktop/default.nix | 13 +++++- .../mate/mate-icon-theme-faenza/default.nix | 20 +++++++-- .../desktops/mate/mate-icon-theme/default.nix | 22 ++++++++-- .../mate/mate-indicator-applet/default.nix | 13 +++++- pkgs/desktops/mate/mate-media/default.nix | 14 +++++- pkgs/desktops/mate/mate-menus/default.nix | 22 ++++++++-- pkgs/desktops/mate/mate-netbook/default.nix | 14 +++++- .../mate/mate-notification-daemon/default.nix | 18 +++++++- pkgs/desktops/mate/mate-panel/default.nix | 19 +++++++- pkgs/desktops/mate/mate-polkit/default.nix | 13 +++++- .../mate/mate-power-manager/default.nix | 43 +++++++++++++------ .../mate/mate-screensaver/default.nix | 17 +++++++- .../mate/mate-sensors-applet/default.nix | 19 +++++++- .../mate/mate-session-manager/default.nix | 21 +++++++-- .../mate/mate-settings-daemon/default.nix | 24 +++++++++-- .../mate/mate-settings-daemon/wrapped.nix | 22 ++++++++-- .../mate/mate-system-monitor/default.nix | 17 +++++++- pkgs/desktops/mate/mate-terminal/default.nix | 16 ++++++- pkgs/desktops/mate/mate-themes/default.nix | 34 ++++++++++++--- .../desktops/mate/mate-user-guide/default.nix | 20 +++++++-- .../desktops/mate/mate-user-share/default.nix | 20 ++++++++- pkgs/desktops/mate/mate-utils/default.nix | 20 ++++++++- pkgs/desktops/mate/mozo/default.nix | 30 +++++++++++-- pkgs/desktops/mate/pluma/default.nix | 20 ++++++++- pkgs/desktops/mate/python-caja/default.nix | 11 ++++- 41 files changed, 685 insertions(+), 103 deletions(-) diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index c88e3a72ea4..1a35169d5a2 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , pkg-config , gettext @@ -12,10 +13,14 @@ , texlive , mate , wrapGAppsHook -, enableEpub ? true, webkitgtk -, enableDjvu ? true, djvulibre -, enablePostScript ? true, libspectre -, enableXps ? true, libgxps +, enableEpub ? true +, webkitgtk +, enableDjvu ? true +, djvulibre +, enablePostScript ? true +, libspectre +, enableXps ? true +, libgxps , enableImages ? false , mateUpdateScript }: @@ -47,7 +52,7 @@ stdenv.mkDerivation rec { mate.caja mate.mate-desktop hicolor-icon-theme - texlive.bin.core # for synctex, used by the pdf back-end + texlive.bin.core # for synctex, used by the pdf back-end ] ++ optionals enableDjvu [ djvulibre ] ++ optionals enableEpub [ webkitgtk ] diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 0d347b39f10..3806d8cf482 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,6 +1,16 @@ -{ lib, stdenv, fetchurl, substituteAll -, pkg-config, gobject-introspection, gdk-pixbuf -, gtk3, mate, python3, dropbox, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, substituteAll +, pkg-config +, gobject-introspection +, gdk-pixbuf +, gtk3 +, mate +, python3 +, dropbox +, mateUpdateScript +}: let dropboxd = "${dropbox}/bin/dropbox"; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index 25563c5d5a8..cc3a6ce30ca 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook, mateUpdateScript -, glib, substituteAll }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gupnp +, mate +, imagemagick +, wrapGAppsHook +, mateUpdateScript +, glib +, substituteAll +}: stdenv.mkDerivation rec { pname = "caja-extensions"; diff --git a/pkgs/desktops/mate/caja-with-extensions/default.nix b/pkgs/desktops/mate/caja-with-extensions/default.nix index dd9ab9be1d3..4de6d5d6d76 100644 --- a/pkgs/desktops/mate/caja-with-extensions/default.nix +++ b/pkgs/desktops/mate/caja-with-extensions/default.nix @@ -1,4 +1,11 @@ -{ stdenv, lib, makeWrapper, caja-extensions, caja, extensions ? [ caja-extensions ], mateUpdateScript }: +{ stdenv +, lib +, makeWrapper +, caja-extensions +, caja +, extensions ? [ caja-extensions ] +, mateUpdateScript +}: stdenv.mkDerivation { pname = "${caja.pname}-with-extensions"; @@ -6,7 +13,9 @@ stdenv.mkDerivation { dontUnpack = true; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + makeWrapper + ]; inherit caja; diff --git a/pkgs/desktops/mate/caja/default.nix b/pkgs/desktops/mate/caja/default.nix index 09818266465..649f6f3c7e4 100644 --- a/pkgs/desktops/mate/caja/default.nix +++ b/pkgs/desktops/mate/caja/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libnotify, libxml2, libexif, exempi, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libnotify +, libxml2 +, libexif +, exempi +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "caja"; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index 7fde8fb1958..98e03044ad4 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, gtk3, file, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, gtk3 +, file +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "engrampa"; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 9862c3059d2..45f9a714c23 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, libpeas, shared-mime-info, gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, exempi +, lcms2 +, libexif +, libjpeg +, librsvg +, libxml2 +, libpeas +, shared-mime-info +, gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "eom"; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index d7969f55efc..4a0e1b604a5 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libxklavier, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libxklavier +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1b8iv2hmy8z2zzdsx8j5g583ddxh178bq8dnlqng9ifbn35fh3i2"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libxklavier ]; + buildInputs = [ + gtk3 + libxklavier + ]; enableParallelBuilding = true; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 2ef34f2ea67..5021a0f870e 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,6 +1,14 @@ -{ config, lib, stdenv, fetchurl, pkg-config, gettext, glib -, alsaSupport ? stdenv.isLinux, alsa-lib -, pulseaudioSupport ? config.pulseaudio or true, libpulseaudio +{ config +, lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, alsaSupport ? stdenv.isLinux +, alsa-lib +, pulseaudioSupport ? config.pulseaudio or true +, libpulseaudio , ossSupport ? false , mateUpdateScript }: @@ -14,11 +22,16 @@ stdenv.mkDerivation rec { sha256 = "1wcz4ppg696m31f5x7rkyvxxdriik2vprsr83b4wbs97bdhcr6ws"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ glib ] - ++ lib.optional alsaSupport alsa-lib - ++ lib.optional pulseaudioSupport libpulseaudio; + buildInputs = [ + glib + ] + ++ lib.optional alsaSupport alsa-lib + ++ lib.optional pulseaudioSupport libpulseaudio; configureFlags = lib.optional ossSupport "--enable-oss"; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 3d99b0ccd82..f68d33a4a51 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libsoup, tzdata, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libsoup +, tzdata +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "05bvc220p135l6qnhh3qskljxffds0f7fjbjnrpq524w149rgzd7"; }; - nativeBuildInputs = [ pkg-config gettext ]; + nativeBuildInputs = [ + pkg-config + gettext + ]; - buildInputs = [ gtk3 libsoup tzdata ]; + buildInputs = [ + gtk3 + libsoup + tzdata + ]; configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 597538a9f8a..612a2c22b10 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,5 +1,22 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, libcanberra-gtk3, libgtop -, libXdamage, libXpresent, libstartup_notification, gnome, glib, gtk3, mate-settings-daemon, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, libcanberra-gtk3 +, libgtop +, libXdamage +, libXpresent +, libstartup_notification +, gnome +, glib +, gtk3 +, mate-settings-daemon +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "marco"; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 30b51e9ed5b..7ffa1abe087 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,6 +1,29 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, dbus-glib, glib, gtk3, gtksourceview3 -, gucharmap, libmateweather, libnl, libwnck, libgtop, libxml2, libnotify, mate-panel, polkit -, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, dbus-glib +, glib +, gtk3 +, gtksourceview3 +, gucharmap +, libmateweather +, libnl +, libwnck +, libgtop +, libxml2 +, libnotify +, mate-panel +, polkit +, upower +, wirelesstools +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-applets"; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 3076a7170cb..cb006cf5327 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, meson, ninja, gettext, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, fetchpatch +, meson +, ninja +, gettext +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-backgrounds"; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index b26347f7339..12ea1adf553 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libmpc, libxml2, mpfr, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libmpc +, libxml2 +, mpfr +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-calc"; diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index c3d2910e869..e247eef07cc 100644 --- a/pkgs/desktops/mate/mate-common/default.nix +++ b/pkgs/desktops/mate/mate-common/default.nix @@ -1,4 +1,8 @@ -{ lib, stdenv, fetchurl, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-common"; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 58828aa52b9..25d8f889d39 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,6 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, dbus-glib -, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, glib -, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, librsvg +, libappindicator-gtk3 +, glib +, desktop-file-utils +, dconf +, gtk3 +, polkit +, mate +, hicolor-icon-theme +, wrapGAppsHook , mateUpdateScript }: diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index e4928ac748b..85d6ca40532 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, isocodes, gnome, gtk3, dconf, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, isocodes +, gnome +, gtk3 +, dconf +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-desktop"; diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 69f780f6083..481684ba5bb 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, autoreconfHook +, gtk3 +, mate +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme-faenza"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; - nativeBuildInputs = [ autoreconfHook gtk3 ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; - propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; + propagatedBuildInputs = [ + mate.mate-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 001b6e41879..0f4f7a71e28 100644 --- a/pkgs/desktops/mate/mate-icon-theme/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme/default.nix @@ -1,4 +1,14 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, iconnamingutils, librsvg, gtk3, hicolor-icon-theme, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, iconnamingutils +, librsvg +, gtk3 +, hicolor-icon-theme +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-icon-theme"; @@ -9,9 +19,15 @@ stdenv.mkDerivation rec { sha256 = "0nha555fhhn0j5wmzmdc7bh93ckzwwdm8mwmzma5whkzslv09xa1"; }; - nativeBuildInputs = [ pkg-config gettext iconnamingutils ]; + nativeBuildInputs = [ + pkg-config + gettext + iconnamingutils + ]; - buildInputs = [ librsvg ]; + buildInputs = [ + librsvg + ]; propagatedBuildInputs = [ hicolor-icon-theme diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 08985608cd6..be5db13e11a 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libindicator-gtk3 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 839e1dc2034..5663821ab41 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, libtool +, libxml2 +, libcanberra-gtk3 +, gtk3 +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-media"; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 2d384d4687b..cab4bc0b160 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, gobject-introspection, python3, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, gobject-introspection +, python3 +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -9,9 +18,16 @@ stdenv.mkDerivation rec { sha256 = "1r7zf64aclaplz77hkl9kq0xnz6jk1l49z64i8v56c41pm59c283"; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection ]; + nativeBuildInputs = [ + pkg-config + gettext + gobject-introspection + ]; - buildInputs = [ glib python3 ]; + buildInputs = [ + glib + python3 + ]; makeFlags = [ "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/" diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index f9c4737bab1..fbbedce99a9 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,16 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, libwnck, libfakekey, libXtst, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, libwnck +, libfakekey +, libXtst +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-netbook"; diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index a66f8de4346..1e79e778699 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, libcanberra-gtk3, - libnotify, libwnck, gtk3, libxml2, mate-desktop, mate-panel, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, libcanberra-gtk3 +, libnotify +, libwnck +, gtk3 +, libxml2 +, mate-desktop +, mate-panel +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-notification-daemon"; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 77569e11664..258fe5f68f9 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, libwnck, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, libwnck +, librsvg +, libxml2 +, dconf +, gtk3 +, mate +, hicolor-icon-theme +, gobject-introspection +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-panel"; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 9b1d77d7824..1c67e62bb80 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,15 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, gobject-introspection +, libappindicator-gtk3 +, libindicator-gtk3 +, polkit +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-polkit"; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index 72f9ba93a43..d77fb6b5b2e 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, libsecret, dbus-glib, upower, gtk3, libtool, polkit, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, itstool +, libxml2 +, mate-panel +, libnotify +, libcanberra-gtk3 +, libsecret +, dbus-glib +, upower +, gtk3 +, libtool +, polkit +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -17,17 +36,17 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - glib - itstool - libxml2 - libcanberra-gtk3 - gtk3 - libsecret - libnotify - dbus-glib - upower - polkit - mate-panel + glib + itstool + libxml2 + libcanberra-gtk3 + gtk3 + libsecret + libnotify + dbus-glib + upower + polkit + mate-panel ]; configureFlags = [ "--enable-applets" ]; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index d80a19e29bb..e9994e15e63 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, dbus-glib +, libXScrnSaver +, libnotify +, libxml2 +, pam +, systemd +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-screensaver"; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index 6faceee002e..48a16c84d1d 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,5 +1,20 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify -, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, libxml2 +, libxslt +, libatasmart +, libnotify +, lm_sensors +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index dba5c374f94..03a18008e43 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,6 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, xtrans, dbus-glib, systemd, - libSM, libXtst, gtk3, libepoxy, polkit, hicolor-icon-theme, mate, - wrapGAppsHook, fetchpatch, mateUpdateScript +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, xtrans +, dbus-glib +, systemd +, libSM +, libXtst +, gtk3 +, libepoxy +, polkit +, hicolor-icon-theme +, mate +, wrapGAppsHook +, fetchpatch +, mateUpdateScript }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index ff46b339b2f..20a9a97d251 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,7 +1,23 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, glib, dbus-glib, libxklavier, - libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, - pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, - wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, glib +, dbus-glib +, libxklavier +, libcanberra-gtk3 +, libnotify +, nss +, polkit +, dconf +, gtk3 +, mate +, pulseaudioSupport ? stdenv.config.pulseaudio or true +, libpulseaudio +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-settings-daemon"; diff --git a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix index 8fe7a4cf2b2..1bbe53c4478 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/wrapped.nix @@ -1,16 +1,31 @@ -{ stdenv, mate, glib, wrapGAppsHook }: +{ stdenv +, mate +, glib +, wrapGAppsHook +}: stdenv.mkDerivation { pname = "${mate.mate-settings-daemon.pname}-wrapped"; version = mate.mate-settings-daemon.version; - nativeBuildInputs = [ wrapGAppsHook ]; - buildInputs = [ glib mate.mate-control-center ]; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + glib + mate.mate-control-center + ]; + dontWrapGApps = true; + dontUnpack = true; + installPhase = '' mkdir -p $out/etc/xdg/autostart cp ${mate.mate-settings-daemon}/etc/xdg/autostart/mate-settings-daemon.desktop $out/etc/xdg/autostart ''; + postFixup = '' mkdir -p $out/libexec makeWrapper ${mate.mate-settings-daemon}/libexec/mate-settings-daemon $out/libexec/mate-settings-daemon \ @@ -18,5 +33,6 @@ stdenv.mkDerivation { substituteInPlace $out/etc/xdg/autostart/mate-settings-daemon.desktop \ --replace "${mate.mate-settings-daemon}/libexec/mate-settings-daemon" "$out/libexec/mate-settings-daemon" ''; + meta = mate.mate-settings-daemon.meta // { priority = -10; }; } diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 9b4a510b728..9da865f2dcf 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck, librsvg, polkit, systemd, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtkmm3 +, libxml2 +, libgtop +, libwnck +, librsvg +, polkit +, systemd +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-system-monitor"; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index fcae87a869e..9f19d905ca4 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,18 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, libxml2, mate-desktop, dconf, vte, pcre2, wrapGAppsHook, mateUpdateScript, nixosTests }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, libxml2 +, mate-desktop +, dconf +, vte +, pcre2 +, wrapGAppsHook +, mateUpdateScript +, nixosTests +}: stdenv.mkDerivation rec { pname = "mate-terminal"; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 27450197623..1ae2c74c77e 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,5 +1,17 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, mate-icon-theme, gtk2, gtk3, - gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, mate-icon-theme +, gtk2 +, gtk3 +, gtk_engines +, gtk-engine-murrine +, gdk-pixbuf +, librsvg +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-themes"; @@ -10,11 +22,23 @@ stdenv.mkDerivation rec { sha256 = "1avgzccdmr7y18rnp3xrhwk82alv2dlig3wh7ivgahcqdiiavrb1"; }; - nativeBuildInputs = [ pkg-config gettext gtk3 ]; + nativeBuildInputs = [ + pkg-config + gettext + gtk3 + ]; - buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; + buildInputs = [ + mate-icon-theme + gtk2 + gtk_engines + gdk-pixbuf + librsvg + ]; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; dontDropIconThemeCache = true; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index ecbe2e667aa..f24b02e7937 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, gettext +, itstool +, libxml2 +, yelp +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -9,9 +17,15 @@ stdenv.mkDerivation rec { sha256 = "1h620ngryqc4m8ybvc92ba8404djnm0l65f34mlw38g9ad8d9085"; }; - nativeBuildInputs = [ itstool gettext libxml2 ]; + nativeBuildInputs = [ + itstool + gettext + libxml2 + ]; - buildInputs = [ yelp ]; + buildInputs = [ + yelp + ]; postPatch = '' substituteInPlace mate-user-guide.desktop.in.in \ diff --git a/pkgs/desktops/mate/mate-user-share/default.nix b/pkgs/desktops/mate/mate-user-share/default.nix index 264389a6883..04a09d6f06c 100644 --- a/pkgs/desktops/mate/mate-user-share/default.nix +++ b/pkgs/desktops/mate/mate-user-share/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, gtk3, dbus-glib, libnotify, libxml2 -, libcanberra-gtk3, mod_dnssd, apacheHttpd, hicolor-icon-theme, mate, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, gtk3 +, dbus-glib +, libnotify +, libxml2 +, libcanberra-gtk3 +, mod_dnssd +, apacheHttpd +, hicolor-icon-theme +, mate +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-user-share"; diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix index 48e662f54f7..13e5e5154ca 100644 --- a/pkgs/desktops/mate/mate-utils/default.nix +++ b/pkgs/desktops/mate/mate-utils/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, itstool, glib, gtk3, libxml2, libgtop, libcanberra-gtk3 -, inkscape, udisks2, mate, hicolor-icon-theme, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, itstool +, glib +, gtk3 +, libxml2 +, libgtop +, libcanberra-gtk3 +, inkscape +, udisks2 +, mate +, hicolor-icon-theme +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "mate-utils"; diff --git a/pkgs/desktops/mate/mozo/default.nix b/pkgs/desktops/mate/mozo/default.nix index 6388b2319e8..a4c08eba614 100644 --- a/pkgs/desktops/mate/mozo/default.nix +++ b/pkgs/desktops/mate/mozo/default.nix @@ -1,4 +1,15 @@ -{ lib, python3, fetchurl, pkg-config, gettext, mate, gtk3, glib, wrapGAppsHook, gobject-introspection, mateUpdateScript }: +{ lib +, python3 +, fetchurl +, pkg-config +, gettext +, mate +, gtk3 +, glib +, wrapGAppsHook +, gobject-introspection +, mateUpdateScript +}: python3.pkgs.buildPythonApplication rec { pname = "mozo"; @@ -12,11 +23,22 @@ python3.pkgs.buildPythonApplication rec { sha256 = "DyRCmjsDe9BojsTDkdnYeB5Csj7zRfXlCvHnLF7y+jk="; }; - nativeBuildInputs = [ pkg-config gettext gobject-introspection wrapGAppsHook ]; + nativeBuildInputs = [ + pkg-config + 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; diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix index 53b0251229a..76ea344a88f 100644 --- a/pkgs/desktops/mate/pluma/default.nix +++ b/pkgs/desktops/mate/pluma/default.nix @@ -1,5 +1,21 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, perl, itstool, isocodes, enchant, libxml2, python3 -, adwaita-icon-theme, gtksourceview4, libpeas, mate-desktop, wrapGAppsHook, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, perl +, itstool +, isocodes +, enchant +, libxml2 +, python3 +, adwaita-icon-theme +, gtksourceview4 +, libpeas +, mate-desktop +, wrapGAppsHook +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "pluma"; diff --git a/pkgs/desktops/mate/python-caja/default.nix b/pkgs/desktops/mate/python-caja/default.nix index 452a7943d66..0b0a1a833fc 100644 --- a/pkgs/desktops/mate/python-caja/default.nix +++ b/pkgs/desktops/mate/python-caja/default.nix @@ -1,4 +1,13 @@ -{ lib, stdenv, fetchurl, pkg-config, gettext, gtk3, mate, python3Packages, mateUpdateScript }: +{ lib +, stdenv +, fetchurl +, pkg-config +, gettext +, gtk3 +, mate +, python3Packages +, mateUpdateScript +}: stdenv.mkDerivation rec { pname = "python-caja";