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/servers/mpd | |
| parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) | |
| download | nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.gz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.bz2 nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.lz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.xz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.zst nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.zip | |
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/servers/mpd')
| -rw-r--r-- | pkgs/servers/mpd/clientlib.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/mpd/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix index 3016b7dba83..b180e62ce18 100644 --- a/pkgs/servers/mpd/clientlib.nix +++ b/pkgs/servers/mpd/clientlib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }: stdenv.mkDerivation rec { version = "2.19"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - meta = with stdenv.lib; { + meta = with lib; { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; license = licenses.gpl2; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 6b7cdc6a3a2..8c50c0b10ae 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, glib, systemd, boost, darwin # Inputs , curl, libmms, libnfs, liburing, samba # Archive support @@ -171,7 +171,7 @@ let passthru.tests.nixos = nixosTests.mpd; - meta = with stdenv.lib; { + meta = with lib; { description = "A flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; license = licenses.gpl2; |