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/games/dxx-rebirth | |
| 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/games/dxx-rebirth')
| -rw-r--r-- | pkgs/games/dxx-rebirth/assets.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/dxx-rebirth/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/dxx-rebirth/full.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/games/dxx-rebirth/assets.nix index 47a8222cd6a9..b214d49659b6 100644 --- a/pkgs/games/dxx-rebirth/assets.nix +++ b/pkgs/games/dxx-rebirth/assets.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, gogUnpackHook }: +{ lib, stdenv, requireFile, gogUnpackHook }: let generic = ver: source: let @@ -40,7 +40,7 @@ let runHook postInstall ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Descent ${toString ver} assets from GOG"; homepage = "https://www.dxx-rebirth.com/"; license = licenses.unfree; diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index aa2563d4e4b9..43c3fd00a020 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,4 +1,4 @@ -{ stdenv +{ lib, stdenv , fetchFromGitHub , fetchurl , fetchpatch @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { install -Dm644 -t $out/share/doc/dxx-rebirth *.txt ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Source Port of the Descent 1 and 2 engines"; homepage = "https://www.dxx-rebirth.com/"; license = licenses.gpl3; diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/games/dxx-rebirth/full.nix index 782a2d21112c..f3349c114eed 100644 --- a/pkgs/games/dxx-rebirth/full.nix +++ b/pkgs/games/dxx-rebirth/full.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper +{ lib, stdenv, makeWrapper , dxx-rebirth, descent1-assets, descent2-assets }: let @@ -14,7 +14,7 @@ let --add-flags "-hogdir ${assets}/share/games/descent${toString ver}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Descent ${toString ver} using the DXX-Rebirth project engine and game assets from GOG"; homepage = "https://www.dxx-rebirth.com/"; license = with licenses; [ free unfree ]; |