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/games/quake2/yquake2/default.nix | 2 +- pkgs/games/quake2/yquake2/games.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/games/quake2/yquake2') diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix index 3d59fc8afb0..57405d9abd3 100644 --- a/pkgs/games/quake2/yquake2/default.nix +++ b/pkgs/games/quake2/yquake2/default.nix @@ -55,7 +55,7 @@ let cp $src/stuff/yq2.cfg $out/share/games/quake2 ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Yamagi Quake II client"; homepage = "https://www.yamagi.org/quake2/"; license = licenses.gpl2; diff --git a/pkgs/games/quake2/yquake2/games.nix b/pkgs/games/quake2/yquake2/games.nix index 091853e485f..02b13048911 100644 --- a/pkgs/games/quake2/yquake2/games.nix +++ b/pkgs/games/quake2/yquake2/games.nix @@ -44,7 +44,7 @@ let cp Release/* $out/lib/yquake2/${id} ''; - meta = with stdenv.lib; { + meta = with lib; { inherit (data) description; homepage = "https://www.yamagi.org/quake2/"; license = licenses.unfree; -- cgit 1.4.1