From a6a4d4b843e8fcf35009ca556d9ed25a700b52d5 Mon Sep 17 00:00:00 2001
From: Adrian Fullmer <adrianfullmer@yahoo.com>
Date: Sat, 14 Mar 2020 11:59:58 -0500
Subject: gnu: bitlbee-discord: Fix build.

* gnu/packages/messaging.scm (bitlbee-discord)[phases]{configure}: Delete
override and move the configure flags to...
[configure-flags]: ... here.  Specify the '--with-bdatadir' configure flag,
which resolves a build failure.

Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/messaging.scm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 22e1c370aa..55c12c8e9a 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -592,20 +592,17 @@ identi.ca and status.net).")
         (base32 "02pigk2vbz0jdz11f96sygdvp1j762yjn62h124fkcsc070g7a2f"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     `(#:configure-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "--with-bdatadir=" out "/share/bitlbee/")
+               (string-append "--with-plugindir=" out "/lib/bitlbee/")))
+       #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'patch-autogen
            (lambda _
              (let ((sh (which "sh")))
                (substitute* "autogen.sh" (("/bin/sh") sh))
-               (setenv "CONFIG_SHELL" sh))
-             #t))
-         (replace 'configure
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (invoke "./configure"
-                     (string-append "--with-plugindir="
-                                    (assoc-ref outputs "out")
-                                    "/lib/bitlbee/")))))))
+               (setenv "CONFIG_SHELL" sh)))))))
     (inputs `(("glib" ,glib)))
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("autoconf" ,autoconf)
-- 
cgit v1.2.3

 value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=4b48a9fee0f517b9faa17eebfa1f71f4692a041a'>root</a>/<a href='/guix/log/gnu?id=4b48a9fee0f517b9faa17eebfa1f71f4692a041a'>gnu</a>/<a href='/guix/log/gnu/packages?id=4b48a9fee0f517b9faa17eebfa1f71f4692a041a'>packages</a>/<a href='/guix/log/gnu/packages/feh.scm?id=4b48a9fee0f517b9faa17eebfa1f71f4692a041a'>feh.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/feh.scm?id=4b48a9fee0f517b9faa17eebfa1f71f4692a041a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2016-02-11 12:46:55 +0200'>2016-02-11</span></td><td><a href='/guix/commit/gnu/packages/feh.scm?id=d2ca99ccbdc6fe9333ee1021a97971742a707af0'>gnu: feh: Update to 2.14.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/feh.scm (feh): Update to 2.14.1.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2015-10-05 16:28:30 +0800'>2015-10-05</span></td><td><a href='/guix/commit/gnu/packages/feh.scm?id=4a30930b84839017d93b5fc8098fd826f430f5a9'>gnu: feh: Update to 2.14.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/feh.scm (feh): Update to 2.14.
</span></span></td><td>宋文武</td></tr>