From 4a7f99d55d299453a9c2397f90b33d1120669775 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Mon, 11 Jan 2021 08:54:33 +0100 Subject: treewide: with stdenv.lib; in meta -> with lib; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- pkgs/applications/audio/pulseaudio-dlna/default.nix | 4 ++-- pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/applications/audio/pulseaudio-dlna') diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index c0986880c0942..3c80a52128614 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, stdenv, pythonPackages +{ fetchFromGitHub, lib, stdenv, pythonPackages , mp3Support ? true, lame ? null , opusSupport ? true, opusTools ? null , faacSupport ? false, faac ? null @@ -44,7 +44,7 @@ pythonPackages.buildPythonApplication { $out/bin/pulseaudio-dlna --help > /dev/null ''; - meta = with stdenv.lib; { + meta = with lib; { description = "A lightweight streaming server which brings DLNA / UPNP and Chromecast support to PulseAudio and Linux"; homepage = "https://github.com/masmu/pulseaudio-dlna"; license = licenses.gpl3Plus; diff --git a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix index efe39aa1600ee..e28aabe8dab15 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/zeroconf.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , buildPythonPackage , fetchPypi , ifaddr @@ -21,7 +21,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ netifaces six enum-compat ifaddr ] ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A pure python implementation of multicast DNS service discovery"; homepage = "https://github.com/jstasiak/python-zeroconf"; license = licenses.lgpl21; -- cgit 1.4.1