about summary refs log tree commit diff
path: root/pkgs/games/zdoom
diff options
context:
space:
mode:
authorProfpatsch <mail@profpatsch.de>2021-01-11 08:54:33 +0100
committerProfpatsch <mail@profpatsch.de>2021-01-11 10:38:22 +0100
commit4a7f99d55d299453a9c2397f90b33d1120669775 (patch)
tree9fca8e9c9970d0a00ce56dfe11b63ae76b00cf01 /pkgs/games/zdoom
parente87aef06e00c42b26789321454d7bd609548cc12 (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/zdoom')
-rw-r--r--pkgs/games/zdoom/bcc-git.nix4
-rw-r--r--pkgs/games/zdoom/default.nix4
-rw-r--r--pkgs/games/zdoom/zdbsp.nix4
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/games/zdoom/bcc-git.nix b/pkgs/games/zdoom/bcc-git.nix
index ae7a4ae6f426f..8716a82fc1053 100644
--- a/pkgs/games/zdoom/bcc-git.nix
+++ b/pkgs/games/zdoom/bcc-git.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub }:
+{ lib, stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
   name = "doom-bcc-git-0.8.0.2018.01.04";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     cp -av lib $out/lib/bcc
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Compiler for Doom/Hexen scripts (ACS, BCS)";
     homepage = "https://github.com/wormt/bcc";
     license = licenses.mit;
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index 37a8fd0fda8d2..3a31f8fdfb5f6 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, p7zip, cmake
+{ lib, stdenv, fetchurl, p7zip, cmake
 , SDL2, openal, fluidsynth, soundfont-fluid, bzip2, zlib, libjpeg, game-music-emu
 , libsndfile, mpg123 }:
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     ln -s $out/lib/zdoom/zdoom $out/bin/zdoom
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://zdoom.org/";
     description = "Enhanced port of the official DOOM source code";
     # Doom source license, MAME license
diff --git a/pkgs/games/zdoom/zdbsp.nix b/pkgs/games/zdoom/zdbsp.nix
index 9b318ef6e7148..e688b908e1268 100644
--- a/pkgs/games/zdoom/zdbsp.nix
+++ b/pkgs/games/zdoom/zdbsp.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, cmake, zlib }:
+{ lib, stdenv, fetchzip, cmake, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "zdbsp";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     install -Dm755 zdbsp $out/bin/zdbsp
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "ZDoom's internal node builder for DOOM maps";
     homepage = "https://zdoom.org/wiki/ZDBSP";
     license = licenses.gpl2Plus;