summaryrefslogtreecommitdiffstats
path: root/pkgs/tools/wayland
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2021-01-11 08:54:33 +0100
committerProfpatsch <mail@profpatsch.de>2021-01-11 10:38:22 +0100
commit4a7f99d55d299453a9c2397f90b33d1120669775 (patch)
tree9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/tools/wayland
parente87aef06e00c42b26789321454d7bd609548cc12 (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/tools/wayland')
-rw-r--r--pkgs/tools/wayland/wayland-utils/default.nix4
-rw-r--r--pkgs/tools/wayland/wlsunset/default.nix4
-rw-r--r--pkgs/tools/wayland/wshowkeys/default.nix4
-rw-r--r--pkgs/tools/wayland/ydotool/default.nix4
4 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/wayland/wayland-utils/default.nix b/pkgs/tools/wayland/wayland-utils/default.nix
index 23629309e52e..5c07081099c6 100644
--- a/pkgs/tools/wayland/wayland-utils/default.nix
+++ b/pkgs/tools/wayland/wayland-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
, meson, pkg-config, ninja
, wayland, wayland-protocols
}:
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson pkg-config ninja wayland ];
buildInputs = [ wayland wayland-protocols ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Wayland utilities (wayland-info)";
longDescription = ''
A collection of Wayland related utilities:
diff --git a/pkgs/tools/wayland/wlsunset/default.nix b/pkgs/tools/wayland/wlsunset/default.nix
index 2993f990aad5..692ddd37cf39 100644
--- a/pkgs/tools/wayland/wlsunset/default.nix
+++ b/pkgs/tools/wayland/wlsunset/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, pkg-config, ninja, wayland
+{ lib, stdenv, fetchurl, meson, pkg-config, ninja, wayland
, wayland-protocols
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ meson pkg-config ninja wayland ];
buildInputs = [ wayland wayland-protocols ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Day/night gamma adjustments for Wayland";
longDescription = ''
Day/night gamma adjustments for Wayland compositors supporting
diff --git a/pkgs/tools/wayland/wshowkeys/default.nix b/pkgs/tools/wayland/wshowkeys/default.nix
index 0db02990c036..1c095ca297a6 100644
--- a/pkgs/tools/wayland/wshowkeys/default.nix
+++ b/pkgs/tools/wayland/wshowkeys/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ lib, stdenv, fetchurl
, meson, pkg-config, wayland, ninja
, cairo, libinput, pango, wayland-protocols, libxkbcommon
}:
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
nativeBuildInputs = [ meson pkg-config wayland ninja ];
buildInputs = [ cairo libinput pango wayland-protocols libxkbcommon ];
- meta = with stdenv.lib; {
+ meta = with lib; {
description = "Displays keys being pressed on a Wayland session";
longDescription = ''
Displays keypresses on screen on supported Wayland compositors (requires
diff --git a/pkgs/tools/wayland/ydotool/default.nix b/pkgs/tools/wayland/ydotool/default.nix
index d8b6ad4ff87c..eaa93daf3cf8 100644
--- a/pkgs/tools/wayland/ydotool/default.nix
+++ b/pkgs/tools/wayland/ydotool/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, boost, libevdevplus, libuinputplus }:
+{ lib, stdenv, fetchFromGitHub, pkgconfig, cmake, boost, libevdevplus, libuinputplus }:
stdenv.mkDerivation rec {
pname = "ydotool";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
boost libevdevplus libuinputplus
];
- meta = with stdenv.lib; {
+ meta = with lib; {
inherit (src.meta) homepage;
description = "Generic Linux command-line automation tool";
license = licenses.mit;