diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix')
-rw-r--r-- | nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix b/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix index d06a66edf1af..ba6c9bc8fdf8 100644 --- a/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix +++ b/nixpkgs/pkgs/applications/terminal-emulators/xterm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkgconfig +{ lib, stdenv, fetchurl, fetchpatch, xorg, ncurses, freetype, fontconfig, pkg-config , makeWrapper, nixosTests, writeScript, common-updater-scripts, git, nixfmt, nix , gnused, coreutils, enableDecLocator ? true }: @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { ncurses freetype fontconfig - pkgconfig + pkg-config xorg.libXft xorg.luit makeWrapper ]; 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; }; } |