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/amoeba | |
| parent | e87aef06e00c42b26789321454d7bd609548cc12 (diff) | |
| download | nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.gz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.bz2 nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.lz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.xz nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.tar.zst nixpkgs-4a7f99d55d299453a9c2397f90b33d1120669775.zip | |
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/amoeba')
| -rw-r--r-- | pkgs/games/amoeba/data.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/amoeba/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/games/amoeba/data.nix b/pkgs/games/amoeba/data.nix index f86ee71aa42..193c710b31a 100644 --- a/pkgs/games/amoeba/data.nix +++ b/pkgs/games/amoeba/data.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { pname = "amoeba-data"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { cp demo.dat $out/share/amoeba/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast-paced, polished OpenGL demonstration by Excess (data files)"; homepage = "https://packages.qa.debian.org/a/amoeba-data.html"; license = licenses.unfree; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 8c4d9ef1092..071a81bcb92 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }: +{ lib, stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, xorg, pkgconfig }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { cp ../debian/amoeba.1 $out/share/man/man1/ ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Fast-paced, polished OpenGL demonstration by Excess"; homepage = "https://packages.qa.debian.org/a/amoeba.html"; license = licenses.gpl2; # Engine is GPLv2, data files in amoeba-data nonfree |