diff options
author | Profpatsch <mail@profpatsch.de> | 2021-01-11 08:54:33 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-01-11 10:38:22 +0100 |
commit | 4a7f99d55d299453a9c2397f90b33d1120669775 (patch) | |
tree | 9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/desktops/mate | |
parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) |
treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938
meta = with stdenv.lib;
is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.
This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.
The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
Diffstat (limited to 'pkgs/desktops/mate')
32 files changed, 64 insertions, 64 deletions
diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 12c89ee1b111..50254fbd29cf 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchurl , pkgconfig , gettext @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "A simple multi-page document viewer for the MATE desktop"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix index 7b2387721dca..85179214b08f 100644 --- a/pkgs/desktops/mate/caja-dropbox/default.nix +++ b/pkgs/desktops/mate/caja-dropbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, substituteAll +{ lib, stdenv, fetchurl, substituteAll , pkgconfig, gobject-introspection, gdk-pixbuf , gtk3, mate, python3, dropbox }: @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Dropbox extension for Caja file manager"; homepage = "https://github.com/mate-desktop/caja-dropbox"; license = with licenses; [ gpl3 cc-by-nd-30 ]; diff --git a/pkgs/desktops/mate/caja-extensions/default.nix b/pkgs/desktops/mate/caja-extensions/default.nix index d71d72ce1886..a9cd7abf8574 100644 --- a/pkgs/desktops/mate/caja-extensions/default.nix +++ b/pkgs/desktops/mate/caja-extensions/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gupnp, mate, imagemagick, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "caja-extensions"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Set of extensions for Caja file manager"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/libmatekbd/default.nix b/pkgs/desktops/mate/libmatekbd/default.nix index f0e178ea9e8e..4b652d06d29e 100644 --- a/pkgs/desktops/mate/libmatekbd/default.nix +++ b/pkgs/desktops/mate/libmatekbd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libxklavier }: stdenv.mkDerivation rec { pname = "libmatekbd"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Keyboard management library for MATE"; homepage = "https://github.com/mate-desktop/libmatekbd"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/libmatemixer/default.nix b/pkgs/desktops/mate/libmatemixer/default.nix index 8b1e68e8b35c..97a55b5e45eb 100644 --- a/pkgs/desktops/mate/libmatemixer/default.nix +++ b/pkgs/desktops/mate/libmatemixer/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, fetchurl, pkgconfig, gettext, glib +{ config, lib, stdenv, fetchurl, pkgconfig, gettext, glib , alsaSupport ? stdenv.isLinux, alsaLib , pulseaudioSupport ? config.pulseaudio or true, libpulseaudio , ossSupport ? false @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Mixer library for MATE"; homepage = "https://github.com/mate-desktop/libmatemixer"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index 3bfdfea06f17..4ecdfcdf157f 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libsoup, tzdata }: stdenv.mkDerivation rec { pname = "libmateweather"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library to access weather information from online services for MATE"; homepage = "https://github.com/mate-desktop/libmateweather"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/marco/default.nix b/pkgs/desktops/mate/marco/default.nix index 69beaa3cee7a..fc098428fcb5 100644 --- a/pkgs/desktops/mate/marco/default.nix +++ b/pkgs/desktops/mate/marco/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, libcanberra-gtk3, libgtop, libstartup_notification, gnome3, gtk3, mate-settings-daemon, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "marco"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; license = [ licenses.gpl2 ]; diff --git a/pkgs/desktops/mate/mate-applets/default.nix b/pkgs/desktops/mate/mate-applets/default.nix index 2a97bc851da0..533070c2698a 100644 --- a/pkgs/desktops/mate/mate-applets/default.nix +++ b/pkgs/desktops/mate/mate-applets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gnome3, glib, gtk3, gtksourceview3, libwnck3, libgtop, libxml2, libnotify, polkit, upower, wirelesstools, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-applets"; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Applets for use with the MATE panel"; homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-backgrounds/default.nix b/pkgs/desktops/mate/mate-backgrounds/default.nix index 8e2aa6933ffe..f49529c4a663 100644 --- a/pkgs/desktops/mate/mate-backgrounds/default.nix +++ b/pkgs/desktops/mate/mate-backgrounds/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, meson, ninja, gettext }: +{ lib, stdenv, fetchurl, meson, ninja, gettext }: stdenv.mkDerivation rec { pname = "mate-backgrounds"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ninja ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Background images and data for MATE"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-calc/default.nix b/pkgs/desktops/mate/mate-calc/default.nix index 48c9f37c03af..a9ed85e650b5 100644 --- a/pkgs/desktops/mate/mate-calc/default.nix +++ b/pkgs/desktops/mate/mate-calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-calc"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 4c26961ba156..397f4969b6ec 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, libxml2, dbus-glib, libxklavier, libcanberra-gtk3, librsvg, libappindicator-gtk3, desktop-file-utils, dconf, gtk3, polkit, mate, hicolor-icon-theme, wrapGAppsHook }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Utilities to configure the MATE desktop"; homepage = "https://github.com/mate-desktop/mate-control-center"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-desktop/default.nix b/pkgs/desktops/mate/mate-desktop/default.nix index 2e298d14168e..1f9db9a95202 100644 --- a/pkgs/desktops/mate/mate-desktop/default.nix +++ b/pkgs/desktops/mate/mate-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, isocodes, gnome3, gtk3, dconf, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-desktop"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Library with common API for various MATE modules"; homepage = "https://mate-desktop.org"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 235929dce0c7..981a5a04f02c 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libindicator-gtk3, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-indicator-applet"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-indicator-applet"; description = "MATE panel indicator applet"; longDescription = '' diff --git a/pkgs/desktops/mate/mate-media/default.nix b/pkgs/desktops/mate/mate-media/default.nix index 458e4638ada8..77e98495b099 100644 --- a/pkgs/desktops/mate/mate-media/default.nix +++ b/pkgs/desktops/mate/mate-media/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, libtool, libxml2, libcanberra-gtk3, gtk3, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-media"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Media tools for MATE"; homepage = "https://mate-desktop.org"; license = licenses.gpl3; diff --git a/pkgs/desktops/mate/mate-menus/default.nix b/pkgs/desktops/mate/mate-menus/default.nix index 73f8be24cc38..ae145061e1fb 100644 --- a/pkgs/desktops/mate/mate-menus/default.nix +++ b/pkgs/desktops/mate/mate-menus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, gobject-introspection, python3 }: stdenv.mkDerivation rec { pname = "mate-menus"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Menu system for MATE"; homepage = "https://github.com/mate-desktop/mate-menus"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/mate-netbook/default.nix b/pkgs/desktops/mate/mate-netbook/default.nix index 4c3338ef907d..7103464f23ac 100644 --- a/pkgs/desktops/mate/mate-netbook/default.nix +++ b/pkgs/desktops/mate/mate-netbook/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, libwnck3, libfakekey, libXtst, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-netbook"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE utilities for netbooks"; longDescription = '' MATE utilities for netbooks are an applet and a daemon to maximize diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix index 0a797f4defa0..6c95f445ace7 100644 --- a/pkgs/desktops/mate/mate-notification-daemon/default.nix +++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, libcanberra-gtk3, libnotify, libwnck3, gtk3, libxml2, wrapGAppsHook }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Notification daemon for MATE Desktop"; homepage = "https://github.com/mate-desktop/mate-notification-daemon"; license = licenses.gpl2; diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index 4b021bcc0991..9a09b5e949f4 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, glib, libwnck3, librsvg, libxml2, dconf, gtk3, mate, hicolor-icon-theme, gobject-introspection, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-panel"; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The MATE panel"; homepage = "https://github.com/mate-desktop/mate-panel"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/mate-polkit/default.nix b/pkgs/desktops/mate/mate-polkit/default.nix index 2ab526240418..556bfa02d3d3 100644 --- a/pkgs/desktops/mate/mate-polkit/default.nix +++ b/pkgs/desktops/mate/mate-polkit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, gobject-introspection, libappindicator-gtk3, libindicator-gtk3, polkit }: stdenv.mkDerivation rec { pname = "mate-polkit"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-power-manager/default.nix b/pkgs/desktops/mate/mate-power-manager/default.nix index c6872cc5beb9..995041be6bd4 100644 --- a/pkgs/desktops/mate/mate-power-manager/default.nix +++ b/pkgs/desktops/mate/mate-power-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate-panel, libnotify, libcanberra-gtk3, dbus-glib, upower, gnome3, gtk3, libtool, polkit, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-power-manager"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The MATE Power Manager"; homepage = "https://mate-desktop.org"; license = licenses.gpl3; diff --git a/pkgs/desktops/mate/mate-screensaver/default.nix b/pkgs/desktops/mate/mate-screensaver/default.nix index f05d8a736d5d..18f8f5713320 100644 --- a/pkgs/desktops/mate/mate-screensaver/default.nix +++ b/pkgs/desktops/mate/mate-screensaver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, gtk3, dbus-glib, libXScrnSaver, libnotify, libxml2, pam, systemd, mate, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-screensaver"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Screen saver and locker for the MATE desktop"; homepage = "https://mate-desktop.org"; license = with licenses; [ gpl2Plus lgpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-sensors-applet/default.nix b/pkgs/desktops/mate/mate-sensors-applet/default.nix index babdbcb4da0e..21b5a58a1439 100644 --- a/pkgs/desktops/mate/mate-sensors-applet/default.nix +++ b/pkgs/desktops/mate/mate-sensors-applet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtk3, libxml2, libxslt, libatasmart, libnotify, lm_sensors, mate, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-sensors-applet"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; license = with licenses; [ gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index b8b61324574b..64dfd65b20d8 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, +{ lib, stdenv, fetchurl, pkgconfig, gettext, xtrans, dbus-glib, systemd, libSM, libXtst, gtk3, epoxy, polkit, hicolor-icon-theme, mate, wrapGAppsHook, fetchpatch }: @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { passthru.providedSessions = [ "mate" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE Desktop session manager"; homepage = "https://github.com/mate-desktop/mate-session-manager"; license = with licenses; [ gpl2 lgpl2 ]; diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix index e02323858625..467b8c7c9b0f 100644 --- a/pkgs/desktops/mate/mate-settings-daemon/default.nix +++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, dbus-glib, libxklavier, libcanberra-gtk3, libnotify, nss, polkit, dconf, gtk3, mate, pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio, wrapGAppsHook }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE settings daemon"; homepage = "https://github.com/mate-desktop/mate-settings-daemon"; license = with licenses; [ gpl2 lgpl21 ]; diff --git a/pkgs/desktops/mate/mate-system-monitor/default.nix b/pkgs/desktops/mate/mate-system-monitor/default.nix index 38c6a041e433..f6e767e94abc 100644 --- a/pkgs/desktops/mate/mate-system-monitor/default.nix +++ b/pkgs/desktops/mate/mate-system-monitor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, itstool, gtkmm3, libxml2, libgtop, libwnck3, librsvg, polkit, systemd, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-system-monitor"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "System monitor for the MATE desktop"; homepage = "https://mate-desktop.org"; license = [ licenses.gpl2Plus ]; diff --git a/pkgs/desktops/mate/mate-terminal/default.nix b/pkgs/desktops/mate/mate-terminal/default.nix index c187aba89775..1772eacbd04c 100644 --- a/pkgs/desktops/mate/mate-terminal/default.nix +++ b/pkgs/desktops/mate/mate-terminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: +{ lib, stdenv, fetchurl, pkgconfig, gettext, glib, itstool, libxml2, mate, dconf, gtk3, vte, pcre2, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "mate-terminal"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The MATE Terminal Emulator"; homepage = "https://mate-desktop.org"; license = licenses.gpl3; diff --git a/pkgs/desktops/mate/mate-tweak/default.nix b/pkgs/desktops/mate/mate-tweak/default.nix index 9609d832f6b1..316a72a09c7f 100644 --- a/pkgs/desktops/mate/mate-tweak/default.nix +++ b/pkgs/desktops/mate/mate-tweak/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , python3Packages , intltool @@ -72,7 +72,7 @@ python3Packages.buildPythonApplication rec { done ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; diff --git a/pkgs/desktops/mate/mate-user-guide/default.nix b/pkgs/desktops/mate/mate-user-guide/default.nix index 20ab8a9a361f..7a95620f31e6 100644 --- a/pkgs/desktops/mate/mate-user-guide/default.nix +++ b/pkgs/desktops/mate/mate-user-guide/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gettext, itstool, libxml2, yelp }: +{ lib, stdenv, fetchurl, gettext, itstool, libxml2, yelp }: stdenv.mkDerivation rec { pname = "mate-user-guide"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "MATE User Guide"; homepage = "https://mate-desktop.org"; |