diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
commit | ad1d58c6227abf2a9c80311eb09166a532384ed2 (patch) | |
tree | 852498ff298f9b01c0d2c8b4c883da1a00912260 /pkgs/applications/networking/irc | |
parent | ebe4fd146b29c92fb59f243f75e46afc9f1a9048 (diff) | |
parent | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/irc')
-rw-r--r-- | pkgs/applications/networking/irc/hexchat/default.nix | 49 | ||||
-rw-r--r-- | pkgs/applications/networking/irc/irssi/default.nix | 4 |
2 files changed, 31 insertions, 22 deletions
diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index b3e77a145bc05..331be19abc4cb 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,43 +1,52 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python2 -, libtool, pciutils, dbus-glib, libcanberra-gtk2, libproxy -, libsexy, enchant1, libnotify, openssl, intltool +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, gtk2, lua, perl, python3 +, pciutils, dbus-glib, libcanberra-gtk2, libproxy +, libsexy, enchant2, libnotify, openssl, isocodes , desktop-file-utils, hicolor-icon-theme -, autoconf, automake, autoconf-archive +, meson, ninja }: stdenv.mkDerivation rec { - version = "2.12.4"; pname = "hexchat"; + version = "2.14.2"; src = fetchFromGitHub { owner = "hexchat"; repo = "hexchat"; rev = "v${version}"; - sha256 = "1z8v7jg1mc2277k3jihnq4rixw1q27305aw6b6rpb1x7vpiy2zr3"; + sha256 = "1kz81xfis0bw2cfd6ndw32jdzdl5azk9ixqj4a3lginmlj6fs45a"; }; - nativeBuildInputs = [ - pkgconfig libtool intltool - autoconf autoconf-archive automake - ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - gtk2 lua perl python2 pciutils dbus-glib libcanberra-gtk2 libproxy + gtk2 lua perl python3 pciutils dbus-glib libcanberra-gtk2 libproxy libsexy libnotify openssl desktop-file-utils hicolor-icon-theme + isocodes ]; - enableParallelBuilding = true; - - #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path - patchPhase = '' - sed -i "s,libenchant.so.1,${enchant1}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c - ''; + patches = [ + #https://github.com/hexchat/hexchat/issues/2237 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/hexchat/raw/8a08a0c8a8da503b18f2fbb15194c5f3728a689a/f/0001-Python-plugin-Call-EndInterpreter-when-deinit-ing-th.patch"; + sha256 = "1199dj3wvjqj6h5vlm7lzhaax84j9ki6an8y8fs4rww27iq0lk8g"; + }) + ]; - preConfigure = '' - ./autogen.sh + #hexchat and hexchat-text loads enchant spell checking library at run time and so it needs to have route to the path + postPatch = '' + sed -i "s,libenchant-2.so.2,${enchant2}/lib/libenchant-2.so.2,g" src/fe-gtk/sexy-spell-entry.c + sed -i "/flag.startswith('-I')/i if flag.contains('no-such-path')\ncontinue\nendif" plugins/perl/meson.build + chmod +x meson_post_install.py + for f in meson_post_install.py \ + src/common/make-te.py \ + plugins/perl/generate_header.py \ + po/validate-textevent-translations + do + patchShebangs $f + done ''; - configureFlags = [ "--enable-shm" "--enable-textfe" ]; + mesonFlags = [ "-Dwith-lua=lua" "-Dwith-text=true" ]; meta = with stdenv.lib; { description = "A popular and easy to use graphical IRC (chat) client"; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 04f1072936f8f..1751812d67e88 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { - version = "1.2.1"; pname = "irssi"; + version = "1.2.2"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "01lay6bxgsk2vzkiknw12zr8gvgnvk9xwg992496knsgakr0x2zx"; + sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; }; nativeBuildInputs = [ pkgconfig ]; |