diff options
| author | Atemu <atemu.main@gmail.com> | 2023-04-12 10:19:29 +0200 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2023-04-12 10:24:52 +0200 |
| commit | 45393fdf99b2f999720e5d043b77634b2f846871 (patch) | |
| tree | 9af8fd13206f66d62b2b33754637085c2eb2d3dc /pkgs/applications/terminal-emulators | |
| parent | 8655687b5becc369d24f141e657b56cd93badd2c (diff) | |
| download | nixpkgs-45393fdf99b2f999720e5d043b77634b2f846871.tar nixpkgs-45393fdf99b2f999720e5d043b77634b2f846871.tar.gz nixpkgs-45393fdf99b2f999720e5d043b77634b2f846871.tar.bz2 nixpkgs-45393fdf99b2f999720e5d043b77634b2f846871.tar.lz nixpkgs-45393fdf99b2f999720e5d043b77634b2f846871.tar.xz nixpkgs-45393fdf99b2f999720e5d043b77634b2f846871.tar.zst nixpkgs-45393fdf99b2f999720e5d043b77634b2f846871.zip | |
mlterm: clean up libssh support
openssl is not necessary as a direct dep and we no longer need the linker magic.
Diffstat (limited to 'pkgs/applications/terminal-emulators')
| -rw-r--r-- | pkgs/applications/terminal-emulators/mlterm/default.nix | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/pkgs/applications/terminal-emulators/mlterm/default.nix b/pkgs/applications/terminal-emulators/mlterm/default.nix index af2d9d8fd9d..c3ee2954553 100644 --- a/pkgs/applications/terminal-emulators/mlterm/default.nix +++ b/pkgs/applications/terminal-emulators/mlterm/default.nix @@ -2,7 +2,7 @@ , libX11, gdk-pixbuf, cairo, libXft, gtk3, vte , harfbuzz #substituting glyphs with opentype fonts , fribidi, m17n_lib #bidi and encoding -, openssl, libssh2 #build-in ssh +, libssh2 #build-in ssh , fcitx5, fcitx5-gtk, ibus, uim #IME , wrapGAppsHook #color picker in mlconfig , Cocoa #Darwin @@ -29,11 +29,9 @@ stdenv.mkDerivation rec { harfbuzz fribidi vte - ] ++ lib.optionals (!stdenv.isDarwin) [ - # need linker magic, not adapted for Darwin yet - openssl - libssh2 + libssh2 + ] ++ lib.optionals (!stdenv.isDarwin) [ # Not supported on Darwin m17n_lib @@ -62,15 +60,6 @@ stdenv.mkDerivation rec { --replace "-m 2755 -g utmp" " " \ --replace "-m 4755 -o root" " " ''; - NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) " - -L${stdenv.cc.cc.lib}/lib - -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft - -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n - " + lib.optionalString (openssl != null) " - -lcrypto - " + lib.optionalString (libssh2 != null) " - -lssh2 - "; configureFlags = [ "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice @@ -87,7 +76,7 @@ stdenv.mkDerivation rec { "--enable-m17nlib" #character encodings ] ++ lib.optionals stdenv.isDarwin [ "--with-gui=quartz" - ] ++ lib.optionals (libssh2 == null) [ " --disable-ssh2" ]; + ]; enableParallelBuilding = true; |