nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: hexchat: Update to 2.14.1. 

* gnu/packages/messaging.scm (hexchat): Update to 2.14.1.
[source]: Remove obsolete snippet.
[build-system]: Use the meson-build-system.
[native-inputs]: Add perl, and gettext-minimal. Remove autoconf,
autoconf-archive, automake, intltool, and libtool.
[inputs]: Add libproxy.
[arguments]: Add a phase to skip generation of icon and .desktop file databases.
Remove #:make-flags.
This commit is contained in:
Leo Famulari 2018-03-19 12:56:32 -04:00
parent df131dbaf8
commit c2a601c9b1
No known key found for this signature in database
GPG Key ID: 2646FA30BACA7F08
1 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
gnu/packages/messaging.scm
View File

@ -13,6 +13,7 @@
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org> ;;; Copyright © 2017 Theodoros Foradis <theodoros@foradis.org>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Leo Famulari <leo@famulari.name>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -37,6 +38,7 @@
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system glib-or-gtk)
#:use-module (guix build-system meson)
#:use-module (guix build-system python) #:use-module (guix build-system python)
#:use-module (guix build-system perl) #:use-module (guix build-system perl)
#:use-module (guix build-system cmake) #:use-module (guix build-system cmake)
@ -200,30 +202,17 @@ identi.ca and status.net).")
(define-public hexchat (define-public hexchat
(package (package
(name "hexchat") (name "hexchat")
(version "2.12.4") (version "2.14.1")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dl.hexchat.net/hexchat/hexchat-" (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs")) "18h3l34zmazjlfx3irg7k7swppa62ad9ffbl0j3ry8p2xfyf8cmh"))))
(modules '((guix build utils))) (build-system meson-build-system)
(snippet (native-inputs `(("gettext" ,gettext-minimal)
'(begin ("perl" ,perl)
;; Delete dangling symlinks to a non-existent ‘/usr’.
(with-directory-excursion "m4"
(for-each (lambda (f) (delete-file f))
'("intltool.m4" "libtool.m4" "lt~obsolete.m4"
"ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
(delete-file-recursively "build-aux")
(delete-file "po/Makefile.in.in")))))
(build-system gnu-build-system)
(native-inputs `(("autoconf" ,autoconf)
("autoconf-archive" ,autoconf-archive)
("automake" ,automake)
("intltool" ,intltool)
("libtool" ,libtool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(inputs `(("dbus-glib" ,dbus-glib) (inputs `(("dbus-glib" ,dbus-glib)
("dbus" ,dbus) ("dbus" ,dbus)
@ -232,6 +221,7 @@ identi.ca and status.net).")
("gtk" ,gtk+-2) ("gtk" ,gtk+-2)
("libcanberra" ,libcanberra) ("libcanberra" ,libcanberra)
("libnotify" ,libnotify) ("libnotify" ,libnotify)
("libproxy" ,libproxy)
("openssl" ,openssl) ("openssl" ,openssl)
;; Bindings for add-on scripts. ;; Bindings for add-on scripts.
@ -239,17 +229,18 @@ identi.ca and status.net).")
("perl-xml-parser" ,perl-xml-parser) ("perl-xml-parser" ,perl-xml-parser)
("python-2" ,python-2))) ("python-2" ,python-2)))
(arguments (arguments
`(#:make-flags '("UPDATE_ICON_CACHE=true") ; Disable icon theme generation `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
;; Release 2.12.4 wasn't properly bootstrapped. Later ones might be! (add-after 'unpack 'skip-desktop-database-updates
(add-after 'unpack 'bootstrap (lambda _
(lambda* (#:key inputs #:allow-other-keys) ;; The build scripts update icon and desktop file databases when
;; This file is still required for autoreconf. ;; DESTDIR is not set. We can't update these databases from
(copy-file (string-append (assoc-ref inputs "intltool") ;; within the build chroot, but we also don't set DESTDIR. So, we
"/share/intltool/Makefile.in.in") ;; just skip this code.
"po/Makefile.in.in") (substitute* "meson_post_install.py"
(zero? (system* "autoreconf" "-fiv"))))))) (("if 'DESTDIR' not in os.environ:")
"if False:"))
#t)))))
(synopsis "Graphical IRC Client") (synopsis "Graphical IRC Client")
(description (description
"HexChat lets you connect to multiple IRC networks at once. The main "HexChat lets you connect to multiple IRC networks at once. The main