mlterm: stdenv.lib -> lib

This commit is contained in:
Atemu 2020-09-25 11:40:46 +02:00
parent 1ecc5c7760
commit 42a9cfe540

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem { stdenv, lib, fetchurl, pkgconfig, autoconf, makeDesktopItem
, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
, harfbuzz #substituting glyphs with opentype fonts , harfbuzz #substituting glyphs with opentype fonts
, fribidi, m17n_lib #bidi and encoding , fribidi, m17n_lib #bidi and encoding
@ -46,9 +46,9 @@ stdenv.mkDerivation rec {
-L${stdenv.cc.cc.lib}/lib -L${stdenv.cc.cc.lib}/lib
-lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft
-lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n
" + stdenv.lib.optionalString (openssl != null) " " + lib.optionalString (openssl != null) "
-lcrypto -lcrypto
" + stdenv.lib.optionalString (libssh2 != null) " " + lib.optionalString (libssh2 != null) "
-lssh2 -lssh2
"; ";
@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
"--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc"
#mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core
#and configuring ~/.mlterm/key correctly. #and configuring ~/.mlterm/key correctly.
] ++ stdenv.lib.optional (libssh2 == null) "--disable-ssh2"; ] ++ lib.optional (libssh2 == null) "--disable-ssh2";
postInstall = '' postInstall = ''
install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" install -D contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg"
@ -80,13 +80,13 @@ stdenv.mkDerivation rec {
comment = "Terminal emulator"; comment = "Terminal emulator";
desktopName = "mlterm"; desktopName = "mlterm";
genericName = "Terminal emulator"; genericName = "Terminal emulator";
categories = stdenv.lib.concatStringsSep ";" [ categories = lib.concatStringsSep ";" [
"Application" "System" "TerminalEmulator" "Application" "System" "TerminalEmulator"
]; ];
startupNotify = "false"; startupNotify = "false";
}; };
meta = with stdenv.lib; { meta = with lib; {
description = "Multi Lingual TERMinal emulator on X11"; description = "Multi Lingual TERMinal emulator on X11";
homepage = "http://mlterm.sourceforge.net/"; homepage = "http://mlterm.sourceforge.net/";
license = licenses.bsd3; license = licenses.bsd3;