treewide: stdenv.lib -> lib

This commit is contained in:
Ben Siraphob
2021-01-16 17:58:11 +07:00
parent a9bb54359e
commit badf51221d
977 changed files with 2613 additions and 2613 deletions
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig
{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig
, makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix
, gnused, coreutils, enableDecLocator ? true }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
];
patches = [ ./sixel-256.support.patch ]
++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
++ lib.optional stdenv.hostPlatform.isMusl (fetchpatch {
name = "posix-ptys.patch";
url =
"https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1";
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
"--enable-mini-luit"
"--with-tty-group=tty"
"--with-app-defaults=$(out)/lib/X11/app-defaults"
] ++ stdenv.lib.optional enableDecLocator "--enable-dec-locator";
] ++ lib.optional enableDecLocator "--enable-dec-locator";
# Work around broken "plink.sh".
NIX_LDFLAGS = "-lXmu -lXt -lICE -lX11 -lfontconfig";
@@ -79,14 +79,14 @@ stdenv.mkDerivation rec {
updateScript = let
# Tags that end in letters are unstable
suffixes = stdenv.lib.concatStringsSep " "
suffixes = lib.concatStringsSep " "
(map (c: "-c versionsort.suffix='${c}'")
(stdenv.lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz"));
(lib.stringToCharacters "abcdefghijklmnopqrstuvwxyz"));
in writeScript "update.sh" ''
#!${stdenv.shell}
set -o errexit
PATH=${
stdenv.lib.makeBinPath [
lib.makeBinPath [
common-updater-scripts
git
nixfmt
@@ -112,8 +112,8 @@ stdenv.mkDerivation rec {
meta = {
homepage = "https://invisible-island.net/xterm";
license = with stdenv.lib.licenses; [ mit ];
maintainers = with stdenv.lib.maintainers; [ nequissimus vrthra ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
license = with lib.licenses; [ mit ];
maintainers = with lib.maintainers; [ nequissimus vrthra ];
platforms = with lib.platforms; linux ++ darwin;
};
}