rxvt-unicode: remove 'with lib;'

This commit is contained in:
Felix Buehler
2024-08-16 16:09:03 +02:00
committed by Valentin Gagarin
parent ba269a9fec
commit 07440c4a2d
@@ -33,8 +33,6 @@ let
};
in
with lib;
stdenv.mkDerivation {
name = "${pname}-unwrapped-${version}";
inherit pname version;
@@ -49,8 +47,8 @@ stdenv.mkDerivation {
[ libX11 libXt libXft ncurses # required to build the terminfo file
fontconfig freetype libXrender
libptytty
] ++ optionals perlSupport [ perl libXext ]
++ optional gdkPixbufSupport gdk-pixbuf;
] ++ lib.optionals perlSupport [ perl libXext ]
++ lib.optional gdkPixbufSupport gdk-pixbuf;
outputs = [ "out" "terminfo" ];
@@ -73,19 +71,19 @@ stdenv.mkDerivation {
./patches/9.06-font-width.patch
]) ++ [
./patches/256-color-resources.patch
] ++ optional (perlSupport && versionAtLeast perl.version "5.38") (fetchpatch {
] ++ lib.optional (perlSupport && lib.versionAtLeast perl.version "5.38") (fetchpatch {
name = "perl538-locale-c.patch";
url = "https://github.com/exg/rxvt-unicode/commit/16634bc8dd5fc4af62faf899687dfa8f27768d15.patch";
excludes = [ "Changes" ];
sha256 = "sha256-JVqzYi3tcWIN2j5JByZSztImKqbbbB3lnfAwUXrumHM=";
}) ++ optional stdenv.isDarwin ./patches/makefile-phony.patch;
}) ++ lib.optional stdenv.isDarwin ./patches/makefile-phony.patch;
configureFlags = [
"--with-terminfo=${placeholder "terminfo"}/share/terminfo"
"--enable-256-color"
(enableFeature perlSupport "perl")
(enableFeature unicode3Support "unicode3")
] ++ optional emojiSupport "--enable-wide-glyphs";
(lib.enableFeature perlSupport "perl")
(lib.enableFeature unicode3Support "unicode3")
] ++ lib.optional emojiSupport "--enable-wide-glyphs";
LDFLAGS = [ "-lfontconfig" "-lXrender" "-lpthread" ];
CFLAGS = [ "-I${freetype.dev}/include/freetype2" ];
@@ -111,7 +109,7 @@ stdenv.mkDerivation {
passthru.tests.test = nixosTests.terminal-emulators.urxvt;
meta = {
meta = with lib; {
inherit description;
homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html";
downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/";