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/applications/networking/instant-messengers/teamspeak | |
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/applications/networking/instant-messengers/teamspeak')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/teamspeak/client.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/teamspeak/server.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index ba726d5b3771..33b8c5355f70 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl +{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, zlib, glib, libpng, freetype, openssl , xorg, fontconfig, qtbase, qtwebengine, qtwebchannel, qtsvg, qtwebsockets, xkeyboard_config , alsaLib, libpulseaudio ? null, libredirect, quazip, which, unzip, llvmPackages, writeShellScriptBin }: @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; - meta = with stdenv.lib; { + meta = with lib; { description = "The TeamSpeak voice communication tool"; homepage = "https://teamspeak.com/"; license = { diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 521e60c78f00..3dfbb69e83c7 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: +{ lib, stdenv, fetchurl, postgresql, autoPatchelfHook, writeScript }: let arch = if stdenv.is64bit then "amd64" else "x86"; @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { update-source-version teamspeak_server "$version" --system=x86_64-linux ''; - meta = with stdenv.lib; { + meta = with lib; { description = "TeamSpeak voice communication server"; homepage = "https://teamspeak.com/"; license = licenses.unfreeRedistributable; |