--- Begin Message ---
|
Subject: |
[PATCH 1/2] gnu: Add bitlbee-discord. |
|
Date: |
Tue, 1 May 2018 14:05:35 +0200 |
* gnu/packages/messaging.scm (bitlbee-discord): New variable.
(bitlbee): Add 'install-lib' phase.
---
gnu/packages/messaging.scm | 50 ++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index fd1c330ce..d6bd588cb 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -14,6 +14,7 @@
;;; Copyright © 2017 Theodoros Foradis <address@hidden>
;;; Copyright © 2017 Rutger Helling <address@hidden>
;;; Copyright © 2018 Leo Famulari <address@hidden>
+;;; Copyright © 2018 Pierre-Antoine Rouby <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -181,6 +182,9 @@ end-to-end encryption.")
(add-after 'install 'install-etc
(lambda* (#:key (make-flags '()) #:allow-other-keys)
(zero? (apply system* "make" "install-etc" make-flags))))
+ (add-after 'install-etc 'install-lib
+ (lambda* (#:key (make-flags '()) #:allow-other-keys)
+ (zero? (apply system* "make" "install-dev" make-flags))))
(replace 'configure
;; bitlbee's configure script does not tolerate many of the
;; variable settings that Guix would pass to it.
@@ -199,6 +203,52 @@ identi.ca and status.net).")
(home-page "http://www.bitlbee.org/";)
(license (list license:gpl2+ license:bsd-2))))
+(define-public bitlbee-discord
+ (package
+ (name "bitlbee-discord")
+ (version "0.4.1")
+ (source (origin
+ (method url-fetch)
+ (uri
+ (string-append
+ "https://github.com/sm00th/bitlbee-discord/";
+ "archive/" version ".tar.gz"))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1bwqxlg6fwj3749y7w69n9jwsdzf5nl9xqiszbpv9k8x1422i1y1"))))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'autogen
+ (lambda _
+ (invoke "sh" "autogen.sh")))
+ (add-before 'configure 'bash-path
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute* "configure"
+ (("\\$SHELL") (string-append (assoc-ref inputs "bash")
+ "/bin/sh")))))
+ (replace 'configure
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (invoke "./configure"
+ (string-append "--with-plugindir="
+ (assoc-ref outputs "out")
+ "/lib/bitlbee/")))))))
+ (inputs `(("glib" ,glib)))
+ (native-inputs `(("pkg-config" ,pkg-config)
+ ("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("texinfo" ,texinfo)
+ ("libtool" ,libtool)
+ ("bitlbee" ,bitlbee)
+ ("bash" ,bash)))
+ (synopsis "IRC to instant messaging gateway discord plugin")
+ (description "This package is plugin for bitlbee IRC to other messaging
+gateway.")
+ (home-page "http://www.bitlbee.org/";)
+ (license license:gpl2+)))
+
(define-public hexchat
(package
(name "hexchat")
--
2.17.0
--- End Message ---
--- Begin Message ---
|
Subject: |
Re: [PATCH 2/2] gnu: services: bitlbee: Add plugins. |
|
Date: |
Thu, 10 May 2018 22:29:46 +0200 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) |
Hello,
Pierre-Antoine Rouby <address@hidden> skribis:
> * doc/guix.texi (Bitlbee Service): Add plugins.
> * gnu/services/messaging.scm (<bitlbee-configuration>): Add plugins argument.
> (bitlbee-shepherd-service): Update config file.
> (bitlbee-service): Add plugins argument.
Applied with these minor changes:
diff --git a/doc/guix.texi b/doc/guix.texi
index 1acff10dc..637c9c3f4 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -14985,8 +14985,8 @@ networking interface.
@item @code{package} (default: @code{bitlbee})
The BitlBee package to use.
address@hidden @code{plugins} (default: @code{plugins})
-The BitlBee plugins package to use.
address@hidden @code{plugins} (default: @code{'()})
+List of plugin packages to use---e.g., @code{bitlbee-discord}.
@item @code{extra-settings} (default: @code{""})
Configuration snippet added as-is to the BitlBee configuration file.
diff --git a/gnu/services/messaging.scm b/gnu/services/messaging.scm
index c5ad96cc0..4b7e724a7 100644
--- a/gnu/services/messaging.scm
+++ b/gnu/services/messaging.scm
@@ -872,7 +872,6 @@ a gateway between IRC and chat networks.")))
(define* (bitlbee-service #:key (bitlbee bitlbee) ;deprecated
(interface "127.0.0.1") (port 6667)
- (plugins '())
(extra-settings ""))
"Return a service that runs @url{http://bitlbee.org,BitlBee}, a daemon that
acts as a gateway between IRC and chat networks.
@@ -888,5 +887,4 @@ configuration file."
(bitlbee-configuration
(bitlbee bitlbee)
(interface interface) (port port)
- (plugins plugins)
(extra-settings extra-settings))))
Thank you!
Ludo’.
--- End Message ---