[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/13: gnu: messaging: Add 'bash' input for 'wrap-program'.
|
From: |
guix-commits |
|
Subject: |
11/13: gnu: messaging: Add 'bash' input for 'wrap-program'. |
|
Date: |
Fri, 20 Oct 2023 11:27:38 -0400 (EDT) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit 87280c2831458da405cbf582db7024ebc897d096
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Fri Jul 2 12:06:23 2021 +0200
gnu: messaging: Add 'bash' input for 'wrap-program'.
It is required for cross-compilation.
* gnu/packages/messaging.scm
(hexchat): Remove input labels.
[inputs]: Add 'bash-minimal'.
(gajim)[inputs]: Add 'bash-minimal'.
(utox)[inputs]: Likewise (and drop labels, fix indentation).
(qtox)[inputs]: Add 'bash-minimal'.
(perl-net-psyc)[inputs]: Likewise.
(nheko): Likewise.
(psi-plus)[inputs]: Likewise, drop input labels.
Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Modified-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: Iab9daa98205f82b4abf4066c5bfdbf6732485aa2
---
gnu/packages/messaging.scm | 235 +++++++++++++++++++++++----------------------
1 file changed, 119 insertions(+), 116 deletions(-)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4a889f3fe7..cbc303d170 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -776,25 +776,27 @@ used by Pidgin and Bitlbee, among others, to access
(sha256
(base32 "1iy4ln6yfgy3xysrfpjxw8fn38i3qx8jsn2mk2prshfzf7d9gr57"))))
(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)
- ("gtk" ,gtk+-2)
- ("libcanberra" ,libcanberra)
- ("openssl" ,openssl)
-
- ;; Bindings for add-on scripts.
- ("luajit" ,luajit)
- ("perl-xml-parser" ,perl-xml-parser)
- ("python" ,python)
- ("python-cffi" ,python-cffi)
-
- ;; For the ensuing WRAP-PROGRAM.
- ("bash-minimal" ,bash-minimal)))
+ (native-inputs
+ (list gettext-minimal
+ `(,glib "bin") ;need glib-genmarshal
+ perl
+ pkg-config))
+ (inputs
+ (list dbus-glib
+ dbus
+ enchant
+ gtk+-2
+ libcanberra
+ openssl
+
+ ;; Bindings for add-on scripts.
+ luajit
+ perl-xml-parser
+ python
+ python-cffi
+
+ ;; For the ensuing WRAP-PROGRAM.
+ bash-minimal))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -1226,7 +1228,8 @@ of xmpppy.")
python-setuptools
xorg-server-for-tests))
(inputs
- (list avahi
+ (list bash-minimal
+ avahi
dbus
farstream
geoclue
@@ -1703,58 +1706,59 @@ messenger protocol.")
(define-public utox
(package
- (name "utox")
- (version "0.18.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/uTox/uTox";)
- (commit (string-append "v" version))
- (recursive? #t))) ;; Needed for 'minini' git submodule.
- (file-name (string-append name "-" version "-checkout"))
- (sha256
- (base32
- "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g"))))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags '("-DENABLE_TESTS=on")
- #:phases
- (modify-phases %standard-phases
- (add-before 'build 'patch-absolute-filename-libgtk-3
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "../source/src/xlib/gtk.c"
- (("libgtk-3.so")
- (search-input-file inputs "/lib/libgtk-3.so")))))
- (add-after 'install 'wrap-program
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (wrap-program (string-append (assoc-ref outputs "out")
- "/bin/utox")
- ;; For GtkFileChooserDialog.
- `("GSETTINGS_SCHEMA_DIR" =
- (,(string-append (assoc-ref inputs "gtk+")
- "/share/glib-2.0/schemas")))))))))
- (inputs
- `(("dbus" ,dbus)
- ("filteraudio" ,filteraudio)
- ("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("c-toxcore" ,c-toxcore)
- ("gtk+" ,gtk+)
- ("libvpx" ,libvpx)
- ("libx11" ,libx11)
- ("libxext" ,libxext)
- ("libxrender" ,libxrender)
- ("openal" ,openal)
- ("v4l-utils" ,v4l-utils)))
- (native-inputs
- (list check pkg-config))
- (synopsis "Lightweight Tox client")
- (description
- "uTox is a lightweight Tox client. Tox is a distributed and secure
+ (name "utox")
+ (version "0.18.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/uTox/uTox";)
+ (commit (string-append "v" version))
+ (recursive? #t))) ;; Needed for 'minini' git submodule.
+ (file-name (string-append name "-" version "-checkout"))
+ (sha256
+ (base32
+ "01rvlf94d4rkrygnnjak3cg16hrrqyi1rn9nx65y17qk2nbyh68g"))))
+ (build-system cmake-build-system)
+ (arguments
+ `(#:configure-flags '("-DENABLE_TESTS=on")
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'patch-absolute-filename-libgtk-3
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "../source/src/xlib/gtk.c"
+ (("libgtk-3.so")
+ (search-input-file inputs "/lib/libgtk-3.so")))))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (wrap-program (string-append (assoc-ref outputs "out")
+ "/bin/utox")
+ ;; For GtkFileChooserDialog.
+ `("GSETTINGS_SCHEMA_DIR" =
+ (,(string-append (assoc-ref inputs "gtk+")
+ "/share/glib-2.0/schemas")))))))))
+ (inputs
+ (list bash-minimal ;for wrap-program
+ dbus
+ filteraudio
+ fontconfig
+ freetype
+ c-toxcore
+ gtk+
+ libvpx
+ libx11
+ libxext
+ libxrender
+ openal
+ v4l-utils))
+ (native-inputs
+ (list check pkg-config))
+ (synopsis "Lightweight Tox client")
+ (description
+ "uTox is a lightweight Tox client. Tox is a distributed and secure
instant messenger with audio and video chat capabilities.")
- (home-page "https://github.com/uTox/uTox";)
- (license license:gpl3)))
+ (home-page "https://github.com/uTox/uTox";)
+ (license license:gpl3)))
(define-public qtox
(package
@@ -1796,7 +1800,8 @@ instant messenger with audio and video chat
capabilities.")
(native-inputs
(list pkg-config qttools-5))
(inputs
- (list ffmpeg
+ (list bash-minimal
+ ffmpeg
filteraudio
glib
gtk+-2
@@ -1884,7 +1889,7 @@ into existing applications.")
(native-inputs
(list unzip))
(inputs
- (list perl-curses perl-io-socket-ssl))
+ (list bash-minimal perl-curses perl-io-socket-ssl))
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -1915,8 +1920,7 @@ into existing applications.")
(install-file "README.txt" doc)
(install-file "TODO.txt" doc)
(copy-recursively "share/man/man1" man1)
- (copy-recursively "share/man/man3" man3)
- #t)))
+ (copy-recursively "share/man/man3" man3))))
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
;; Make sure all executables in "bin" find the Perl modules
@@ -1927,8 +1931,7 @@ into existing applications.")
(for-each (lambda (file)
(wrap-program file
`("PERL5LIB" ":" prefix (,path))))
- (find-files bin "\\.*$"))
- #t))))))
+ (find-files bin "\\.*$"))))))))
(description
"@code{Net::PSYC} with support for TCP, UDP, Event.pm, @code{IO::Select}
and
Gtk2 event loops. This package includes 12 applications and additional
scripts:
@@ -2424,7 +2427,8 @@ for the Matrix protocol. It is built on to of
@code{Boost.Asio}.")
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix
(,gst-plugin-path)))))))))
(build-system qt-build-system)
(inputs
- (list boost
+ (list bash-minimal
+ boost
blurhash
cpp-httplib
cmark
@@ -3033,8 +3037,7 @@ social and chat platform.")
(("qiteaudio.h")
"qite/qiteaudio.h")
(("qiteaudiorecorder.h")
- "qite/qiteaudiorecorder.h"))
- #t))
+ "qite/qiteaudiorecorder.h"))))
(add-after 'install 'wrap-env
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
@@ -3046,48 +3049,48 @@ social and chat platform.")
(wrap-program file
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))))
- '("psi-plus")))
- #t))
+ '("psi-plus")))))
(add-after 'wrap-env 'glib-or-gtk-compile-schemas
(assoc-ref glib-or-gtk:%standard-phases
'glib-or-gtk-compile-schemas))
(add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(native-inputs
- `(("glib:bin" ,glib "bin")
- ("gobject-introspection" ,gobject-introspection)
- ("perl" ,perl)
- ("pkg-config" ,pkg-config)
- ("python" ,python-wrapper)
- ("ruby" ,ruby)))
+ (list `(,glib "bin")
+ gobject-introspection
+ perl
+ pkg-config
+ python-wrapper
+ ruby))
(inputs
- `(("blake2" ,libb2)
- ("dbus" ,dbus)
- ("enchant" ,enchant)
- ("glib" ,glib)
- ("gstreamer" ,gstreamer)
- ("gst-plugins-base" ,gst-plugins-base)
- ("http-parser" ,http-parser)
- ("libgcrypt" ,libgcrypt)
- ("libgpg-error" ,libgpg-error)
- ("libidn" ,libidn)
- ("libotr" ,libotr)
- ("libsignal-protocol-c" ,libsignal-protocol-c)
- ("libtidy" ,tidy-html)
- ("openssl" ,openssl)
- ("qca" ,qca)
- ("qhttp" ,qhttp)
- ("qite" ,qite)
- ("qtbase" ,qtbase-5)
- ("qtkeychain" ,qtkeychain)
- ("qtmultimedia-5" ,qtmultimedia-5)
- ("qtsvg-5" ,qtsvg-5)
- ("qtx11extras" ,qtx11extras)
- ("usrsctp" ,usrsctp)
- ("x11" ,libx11)
- ("xext" ,libxext)
- ("xcb" ,libxcb)
- ("xss" ,libxscrnsaver)
- ("zlib" ,zlib)))
+ (list bash-minimal ; for wrap-program
+ libb2
+ dbus
+ enchant
+ glib
+ gstreamer
+ gst-plugins-base
+ http-parser
+ libgcrypt
+ libgpg-error
+ libidn
+ libotr
+ libsignal-protocol-c
+ tidy-html
+ openssl
+ qca
+ qhttp
+ qite
+ qtbase-5
+ qtkeychain
+ qtmultimedia-5
+ qtsvg-5
+ qtx11extras
+ usrsctp
+ libx11
+ libxext
+ libxcb
+ libxscrnsaver
+ zlib))
(home-page "https://psi-plus.com/";)
(synopsis "Qt-based XMPP Client")
(description
- 05/13: gnu: pinentry-rofi: Add bash-minimal to inputs., (continued)
- 05/13: gnu: pinentry-rofi: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 04/13: gnu: signing-party: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 08/13: gnu: password-utils: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/20
- 07/13: gnu: parcimonie: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 13/13: gnu: game-development: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/20
- 02/13: gnu: guix: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 09/13: gnu: mail: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/20
- 06/13: gnu: gpa: Add bash-minimal to inputs., guix-commits, 2023/10/20
- 10/13: gnu: engineering: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/20
- 12/13: gnu: maths: Add 'bash' input for 'wrap-program'., guix-commits, 2023/10/20
- 11/13: gnu: messaging: Add 'bash' input for 'wrap-program'.,
guix-commits <=