From fee579701d0868d8896513197580a4876a49ef5e Mon Sep 17 00:00:00 2001 From: romildo Date: Tue, 24 Jan 2017 10:53:58 -0200 Subject: [PATCH] hexchat: 2.12.3 -> 2.12.4 - Update hexchat to version 2.12.4 - Use sources from github, as the source at http://dl.hexchat.net/hexchat/hexchat-2.12.4.tar.xz contains invalid symbolic links in the directory 'build-aux' - Run 'autogen.sh' to generate 'configure' and friends, as they are not available in the distributed sources from github. --- .../networking/irc/hexchat/default.nix | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index 4d7ebbfac2e8..80eea8219be2 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, lua, perl, python +{ stdenv, fetchFromGitHub, pkgconfig, gtk2, lua, perl, python , libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool , desktop_file_utils, hicolor_icon_theme +, autoconf, automake, autoconf-archive }: stdenv.mkDerivation rec { - version = "2.12.3"; + version = "2.12.4"; name = "hexchat-${version}"; - src = fetchurl { - url = "http://dl.hexchat.net/hexchat/${name}.tar.xz"; - sha256 = "1fpj2kk1p85snffchqxsz3sphhcgiripjw41mgzxi7ks5hvj4avg"; + src = fetchFromGitHub { + owner = "hexchat"; + repo = "hexchat"; + rev = "v${version}"; + sha256 = "1z8v7jg1mc2277k3jihnq4rixw1q27305aw6b6rpb1x7vpiy2zr3"; }; nativeBuildInputs = [ pkgconfig libtool intltool + autoconf autoconf-archive automake ]; buildInputs = [ @@ -24,11 +28,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - #hexchat and heachat-text loads enchant spell checking library at run time and so it needs to have route to the path + #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,${enchant}/lib/libenchant.so.1,g" src/fe-gtk/sexy-spell-entry.c ''; + preConfigure = '' + ./autogen.sh + ''; + configureFlags = [ "--enable-shm" "--enable-textfe" ]; meta = with stdenv.lib; {