From 8da527d5bc1a1c6c5718236d1870fe907f80dfc6 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Thu, 21 Nov 2019 22:24:07 +0100 Subject: gnu: hexchat: Fix crash on exit. * gnu/packages/patches/hexchat-crash-exit.patch: New file. * gnu/packages/hexchat.scm (orgin): Add patch. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/packages/messaging.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 3f223c2cfe..694dfbb51d 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -263,7 +263,8 @@ (define-public hexchat version ".tar.xz")) (sha256 (base32 - "064nq151nzsljv97dmkifyl162d2738vbgvm1phx7yv04pjvk4kp")))) + "064nq151nzsljv97dmkifyl162d2738vbgvm1phx7yv04pjvk4kp")) + (patches (search-patches "hexchat-crash-exit.patch")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) ("perl" ,perl) -- cgit v1.2.3 From d34c6a2a930c08fc1e4b87472a82192c124fea92 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 22 Nov 2019 23:39:43 +0100 Subject: gnu: hangups: Update to 0.4.10. * gnu/packages/messaging.scm (hangups): Update to 0.4.10. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 694dfbb51d..33e752c9a0 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -1822,13 +1822,13 @@ (define-public quaternion (define-public hangups (package (name "hangups") - (version "0.4.9") + (version "0.4.10") (source (origin (method url-fetch) (uri (pypi-uri "hangups" version)) (sha256 - (base32 "1jw4i58cd4j1ymsnhv9224xsi26w8y0qrj6z4nw50dnbl45b6aaa")))) + (base32 "0ww9z9kcb02pwnr8q1ll31wkzspc1fci1ly8ifrwzxysp4rxy3j5")))) (build-system python-build-system) (arguments `(#:phases -- cgit v1.2.3 From ff3375251d6a316e3ee05589d70a8bb135ec47a6 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 27 Nov 2019 22:19:13 +0100 Subject: gnu: Use the test-only Xorg variant for tests. * gnu/packages/education.scm (gcompris-qt)[native-inputs]: Change XORG-SERVER to XORG-SERVER-FOR-TESTS. * gnu/packages/engineering.scm (pcb, qucs, openscad)[native-inputs]: Likewise. * gnu/packages/gnome.scm (libbonoboui, d-feet, gspell, libdazzle, libhandy)[native-inputs]: Likewise. * gnu/packages/gnupg.scm (parcimonie)[native-inputs]: Likewise. * gnu/packages/graphics.scm (opensubdiv, rapicorn)[native-inputs]: Likewise. * gnu/packages/gtk.scm (gtksourceview-2, gtksourceview)[native-inputs]: Likewise. * gnu/packages/image-processing.scm (opencv)[native-inputs]: Likewise. * gnu/packages/kde-frameworks.scm (kconfig, kcoreaddons, kwidgetsaddons, kwindowsystem, kdeclarative)[native-inputs]: Likewise. * gnu/packages/kde-plasma.scm (kscreenlocker)[native-inputs]: Likewise. * gnu/packages/messaging.scm (gajim)[native-inputs]: Likewise. * gnu/packages/python-xyz.scm (python-seaborn)[native-inputs]: Likewise. --- gnu/packages/education.scm | 2 +- gnu/packages/engineering.scm | 6 +++--- gnu/packages/gnome.scm | 10 +++++----- gnu/packages/gnupg.scm | 2 +- gnu/packages/graphics.scm | 4 ++-- gnu/packages/gtk.scm | 4 ++-- gnu/packages/image-processing.scm | 2 +- gnu/packages/kde-frameworks.scm | 10 +++++----- gnu/packages/kde-plasma.scm | 2 +- gnu/packages/messaging.scm | 2 +- gnu/packages/python-xyz.scm | 2 +- gnu/packages/vim.scm | 2 +- 12 files changed, 24 insertions(+), 24 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm index c84fa54223..46262fd14b 100644 --- a/gnu/packages/education.scm +++ b/gnu/packages/education.scm @@ -167,7 +167,7 @@ (define-public gcompris-qt ("gettext" ,gettext-minimal) ("perl" ,perl) ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("openssl" ,openssl) ("python-2" ,python-2) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index 294105a757..c5e2f58aeb 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -373,7 +373,7 @@ (define-public pcb ("imagemagick" ,imagemagick) ("gerbv" ,gerbv) ("ghostscript" ,ghostscript) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (home-page "http://pcb.geda-project.org/") (synopsis "Design printed circuit board layouts") (description @@ -1771,7 +1771,7 @@ (define-public qucs ("python" ,python-2) ; for tests ("matplotlib" ,python2-matplotlib) ; for tests ("numpy" ,python2-numpy) ; for tests - ("xorg-server" ,xorg-server))) ; for tests + ("xorg-server" ,xorg-server-for-tests))) ; for tests (inputs `(("adms" ,adms) ("asco" ,asco) @@ -2174,7 +2174,7 @@ (define-public openscad ("imagemagick" ,imagemagick) ("ps" ,procps) ("python" ,python) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index af2558d814..11ed035919 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2025,7 +2025,7 @@ (define-public libbonoboui (native-inputs `(("glib" ,glib "bin") ; for glib-genmarshal, etc. ("intltool" ,intltool) - ("xorg-server" ,xorg-server) ; For running the tests + ("xorg-server" ,xorg-server-for-tests) ; For running the tests ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/libbonoboui/") (synopsis "Some user interface controls using Bonobo") @@ -4591,7 +4591,7 @@ (define-public d-feet ("pkg-config" ,pkg-config) ("python-pep8" ,python-pep8) ("xmllint" ,libxml2) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("gobject-introspection" ,gobject-introspection) ("gtk+" ,gtk+) @@ -7752,7 +7752,7 @@ (define-public gspell ;; For tests. ("aspell-dict-en" ,aspell-dict-en) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (propagated-inputs `(("enchant" ,enchant))) ;enchant.pc is required by gspell-1.pc (home-page "https://wiki.gnome.org/Projects/gspell") @@ -8167,7 +8167,7 @@ (define-public libdazzle `(("glib" ,glib "bin") ; glib-compile-resources ("pkg-config" ,pkg-config) ;; For tests. - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("glib" ,glib) ("gobject-introspection" ,gobject-introspection) @@ -8389,9 +8389,9 @@ (define-public libhandy ("gtk-doc" ,gtk-doc) ("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ("xorg-server" ,xorg-server) ;; Test suite dependencies. + ("xorg-server" ,xorg-server-for-tests) ("hicolor-icon-theme" ,hicolor-icon-theme))) (home-page "https://source.puri.sm/Librem5/libhandy") (synopsis "Library full of GTK+ widgets for mobile phones") diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index 6b6b8f616d..23d3aba90e 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -1045,7 +1045,7 @@ (define-public parcimonie ("perl-xml-twig" ,perl-xml-twig) ("torsocks" ,torsocks))) (native-inputs - `(("xorg-server" ,xorg-server))) + `(("xorg-server" ,xorg-server-for-tests))) (arguments `(#:phases (modify-phases %standard-phases diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4f1c50b272..8795107dcb 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -758,7 +758,7 @@ (define-public rapicorn ("graphviz" ,graphviz) ("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("xvfb" ,xorg-server))) + ("xvfb" ,xorg-server-for-tests))) (home-page "https://rapicorn.testbit.org/") (synopsis "Toolkit for rapid development of user interfaces") (description @@ -1055,7 +1055,7 @@ (define-public opensubdiv (setenv "DISPLAY" ":1") #t))))) (native-inputs - `(("xorg-server" ,xorg-server))) + `(("xorg-server" ,xorg-server-for-tests))) (inputs `(("glew" ,glew) ("libxrandr" ,libxrandr) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e6b9042c00..817c03c30e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -360,7 +360,7 @@ (define-public gtksourceview-2 ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config) ;; For testing. - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ("shared-mime-info" ,shared-mime-info))) (propagated-inputs ;; As per the pkg-config file. @@ -431,7 +431,7 @@ (define-public gtksourceview ("pkg-config" ,pkg-config) ("vala" ,vala) ;; For testing. - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ("shared-mime-info" ,shared-mime-info))) (propagated-inputs ;; gtksourceview-3.0.pc refers to all these. diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 2579da3d6a..1961b47361 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -373,7 +373,7 @@ (define-public opencv (zero? (system (format #f "~a/bin/Xvfb ~a &" xorg-server disp))))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server) ; For running the tests + ("xorg-server" ,xorg-server-for-tests) ; For running the tests ("opencv-extra" ,(origin (method git-fetch) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index ec735d8903..6f7c5df7b4 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -483,7 +483,7 @@ (define-public kconfig ("extra-cmake-modules" ,extra-cmake-modules) ("inetutils" ,inetutils) ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -548,7 +548,7 @@ (define-public kcoreaddons ("qttools" ,qttools) ("shared-mime-info" ,shared-mime-info) ;; TODO: FAM: File alteration notification http://oss.sgi.com/projects/fam - ("xorg-server" ,xorg-server))) ; for the tests + ("xorg-server" ,xorg-server-for-tests))) ; for the tests (inputs `(("qtbase" ,qtbase))) (arguments @@ -1041,7 +1041,7 @@ (define-public kwidgetsaddons (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("qtbase" ,qtbase))) (arguments @@ -1091,7 +1091,7 @@ (define-public kwindowsystem ("dbus" ,dbus) ; for the tests ("openbox" ,openbox) ; for the tests ("qttools" ,qttools) - ("xorg-server" ,xorg-server))) ; for the tests + ("xorg-server" ,xorg-server-for-tests))) ; for the tests (inputs `(("libxrender" ,libxrender) ("qtbase" ,qtbase) @@ -2201,7 +2201,7 @@ (define-public kdeclarative (native-inputs `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("kauth" ,kauth) ("kbookmarks" ,kbookmarks) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index c1731d459a..d381ae9fb4 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -96,7 +96,7 @@ (define-public kscreenlocker ;; For tests. ("dbus" ,dbus) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("kcmutils" ,kcmutils) ("kcrash" ,kcrash) diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 33e752c9a0..2429bad3e5 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -644,7 +644,7 @@ (define-public gajim (native-inputs `(("intltool" ,intltool) ("python-docutils" ,python-docutils) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (inputs `(("adwaita-icon-theme" ,adwaita-icon-theme) ("gnome-keyring" ,gnome-keyring) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f9e726e8fc..7343366cd9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -6310,7 +6310,7 @@ (define-public python-seaborn ("python-scipy" ,python-scipy))) (native-inputs `(("python-pytest" ,python-pytest) - ("xorg-server" ,xorg-server))) + ("xorg-server" ,xorg-server-for-tests))) (home-page "http://stanford.edu/~mwaskom/software/seaborn/") (synopsis "Statistical data visualization") (description diff --git a/gnu/packages/vim.scm b/gnu/packages/vim.scm index ae07bcd9b6..b360d1fcbe 100644 --- a/gnu/packages/vim.scm +++ b/gnu/packages/vim.scm @@ -198,7 +198,7 @@ (define-public vim-full display " &"))))))))))) (native-inputs `(("pkg-config" ,pkg-config) - ("xorg-server" ,xorg-server) + ("xorg-server" ,xorg-server-for-tests) ,@(package-native-inputs vim))) (inputs `(("acl" ,acl) -- cgit v1.2.3 From 403604c31e1a914d338f62d222081be5f62e0520 Mon Sep 17 00:00:00 2001 From: Brett Gilio Date: Wed, 27 Nov 2019 02:08:02 -0600 Subject: gnu: Add tdlib. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (tdlib): New variable. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 2429bad3e5..031c357f51 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2018 Leo Famulari ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Tanguy Le Carrour +;;; Copyright © 2019 Brett Gilio ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,6 +58,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) + #:use-module (gnu packages gperf) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) #:use-module (gnu packages icu4c) @@ -72,6 +74,7 @@ (define-module (gnu packages messaging) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) #:use-module (gnu packages photo) + #:use-module (gnu packages php) #:use-module (gnu packages pkg-config) #:use-module (gnu packages protobuf) #:use-module (gnu packages python) @@ -1946,4 +1949,48 @@ (define-public telegram-purple ;; itself is GPLv2+. (license license:gpl2+))) +(define-public tdlib + (let ((commit "afca63a4f43531058a079e91eb5c81f54ad744b5") + (revision "1") + (version "1.5.0")) + (package + (name "tdlib") + (version (git-version version revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/tdlib/td.git") + (commit commit))) + (sha256 + (base32 + "1aa3p4k32mfshgc6fv58gwg8pnaix39rv455hfx6znj7llr8na6k")) + (file-name (git-file-name name version)))) + (build-system cmake-build-system) + (arguments + `(#:tests? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-failing-tests + (lambda _ + (substitute* "test/CMakeLists.txt" + ;; The test cases are compiled into a distinct binary + ;; which uses mtproto.cpp to attempt to connect to + ;; a remote server. Removing this file from the sources + ;; list disables those specific test cases. + (("\\$\\{CMAKE_CURRENT_SOURCE_DIR\\}/mtproto.cpp") "")) + #t))))) + (native-inputs + `(("gperf" ,gperf) + ("openssl" ,openssl) + ("zlib" ,zlib) + ("php" ,php) + ("doxygen" ,doxygen))) + (synopsis "Cross-platform library for building Telegram clients") + (description "Tdlib is a cross-platform library for creating custom +Telegram clients following the official Telegram API. It can be easily used +from almost any programming language with a C-FFI and features first-class +support for high performance Telegram Bot creation.") + (home-page "https://core.telegram.org/tdlib") + (license license:boost1.0)))) + ;;; messaging.scm ends here -- cgit v1.2.3 From 34e31612e22f0a9174eeb7abc94d9096b41fa542 Mon Sep 17 00:00:00 2001 From: Hartmut Goebel Date: Sat, 30 Nov 2019 22:46:48 +0100 Subject: gnu: quaternion: Use qt-build-system. * gnu/packages/display-managers.scm (quaternion): Use qt-build-sytem. [arguments]: Remove. --- gnu/packages/messaging.scm | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 031c357f51..67a39ab602 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -100,6 +100,7 @@ (define-module (gnu packages messaging) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system qt) #:use-module (guix build-system trivial) #:use-module (guix download) #:use-module (guix git-download) @@ -1789,7 +1790,7 @@ (define-public quaternion (file-name (git-file-name name version)) (sha256 (base32 "0gpv6b3nn3lsyym8809kiqkpdszfasldqjpk5s542zyn41gdlql4")))) - (build-system cmake-build-system) + (build-system qt-build-system) (inputs `(("libqmatrixclient" ,libqmatrixclient) ("qtbase" ,qtbase) @@ -1800,19 +1801,7 @@ (define-public quaternion ("qtsvg" ,qtsvg) ("qttools" ,qttools))) (arguments - `(#:tests? #f ; no tests - #:modules ((guix build cmake-build-system) - (guix build qt-utils) - (guix build utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build qt-utils)) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap-program - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-qt-program out "quaternion") - #t)))))) + `(#:tests? #f)) ; no tests (home-page "https://matrix.org/docs/projects/client/quaternion.html") (synopsis "Graphical client for the Matrix instant messaging protocol") (description "Quaternion is a Qt5 desktop client for the Matrix instant -- cgit v1.2.3 From abad22dd4a3083498263cc5d6817dd7c01df4da1 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 Dec 2019 11:14:09 +0100 Subject: gnu: gajim: Avoid top-level reference to 'python'. This fixes a circular dependency due to this top-level reference to 'python' as discussed in . * gnu/packages/messaging.scm (gajim)[native-search-paths]: Remove reference to 'python'. Hard-code the Python version instead. --- gnu/packages/messaging.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 67a39ab602..cee9d3e215 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -643,7 +643,12 @@ (define-public gajim (variable "PYTHONPATH") (files (list (string-append "lib/python" - (version-major+minor (package-version python)) + + ;; FIXME: Cannot use this expression as it would + ;; introduce a circular dependency at the top level. + ;; (version-major+minor (package-version python)) + "3.7" + "/site-packages")))))) (native-inputs `(("intltool" ,intltool) -- cgit v1.2.3 From 9e21a1c8038adca7d0462adadb10e769498e1d20 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Wed, 4 Dec 2019 10:52:17 +0200 Subject: gnu: hexchat: Fix up inputs. * gnu/packages/messaging.scm (hexchat)[inputs]: Move glib:bin ... [native-inputs]: ... to here. --- gnu/packages/messaging.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index cee9d3e215..73c7620d4e 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -4,7 +4,7 @@ ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus -;;; Copyright © 2015, 2018 Efraim Flashner +;;; Copyright © 2015, 2018, 2019 Efraim Flashner ;;; Copyright © 2016, 2017 ng0 ;;; Copyright © 2016 Andy Patterson ;;; Copyright © 2016, 2017, 2018, 2019 Clément Lassieur @@ -271,12 +271,12 @@ (define-public hexchat (patches (search-patches "hexchat-crash-exit.patch")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ;need glib-genmarshal ("perl" ,perl) ("pkg-config" ,pkg-config))) (inputs `(("dbus-glib" ,dbus-glib) ("dbus" ,dbus) ("enchant" ,enchant) - ("glib:bin" ,glib "bin") ;need glib-genmarshal ("gtk" ,gtk+-2) ("libcanberra" ,libcanberra) ("libnotify" ,libnotify) -- cgit v1.2.3 From d75540473f3f460007f45efab5122c39aa4130ff Mon Sep 17 00:00:00 2001 From: Timotej Lazar Date: Thu, 28 Nov 2019 19:16:41 +0100 Subject: gnu: bitlbee: Use Python 3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/messaging.scm (bitlbee)[inputs]: Replace python-2 with python. [arguments]: Set the PYTHON environment variable before configuring. Signed-off-by: Ludovic Courtès --- gnu/packages/messaging.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'gnu/packages/messaging.scm') diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm index 73c7620d4e..27d2b7689c 100644 --- a/gnu/packages/messaging.scm +++ b/gnu/packages/messaging.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2018 Pierre-Antoine Rouby ;;; Copyright © 2019 Tanguy Le Carrour ;;; Copyright © 2019 Brett Gilio +;;; Copyright © 2019 Timotej Lazar ;;; ;;; This file is part of GNU Guix. ;;; @@ -185,11 +186,13 @@ (define-public bitlbee (inputs `(("glib" ,glib) ("libotr" ,libotr) ("gnutls" ,gnutls) - ("python" ,python-2) + ("python" ,python) ("perl" ,perl))) (arguments `(#:phases (modify-phases %standard-phases + (add-before 'configure 'set-python + (lambda _ (setenv "PYTHON" (which "python3")) #t)) (add-after 'install 'install-etc (lambda* (#:key (make-flags '()) #:allow-other-keys) (apply invoke "make" "install-etc" make-flags))) -- cgit v1.2.3